Merge remote-tracking branch 'origin/master' into mergebot/pr1667

# Conflicts: # apps/web/tests/snapshots/queue-actions/preserved.expected.md # docs/cordis-catalog/services.md # docs/core-data-structures/session.i18n.yaml # packages/client/runtime/src/client/session-history/history-fold.ts # packages/client/ui-conversation/README.i18n.yaml # packages/core/session/src/index.ts
2026-08-05 22:56:57 +08:00
parent 96c44c83d4 17ff1e0d4a
commit b0d1d9445e
826 changed files with 18815 additions and 14777 deletions
@@ -1,4 +1,4 @@
-// Shared IconActions chrome for user, steering, and assistant messages: copy
+// Shared IconActions chrome for user and assistant messages: copy
 // live, optional branch wiring, and an optional date-aware clock.

 import { useCallback, useEffect, useId, useRef, useState } from 'react'
@@ -1,4 +1,4 @@
-// MessageItem: simple chat nodes — user and consumed-steering bubbles
+// MessageItem: simple chat nodes — user bubbles
 // (right-aligned, with clock + copy / branch IconActions), pending steering
 // (copy only), context injection, compaction marker, retry disclosure, and
 // unknown-surface JSON rows.
@@ -6,7 +6,7 @@
 import { memo, useEffect, useMemo, useState } from 'react'
 import type { ReactNode } from 'react'
 import type {
-  CompactionSummaryNode, ContextMessageNode, ModelRetryNode, SteeringMessageNode,
+  CompactionSummaryNode, ContextMessageNode, ModelRetryNode,
  TurnErrorNode, UnknownSurfaceNode, UserMessageNode,
 } from '@deepseek-ai/dsh-client-runtime/client'
 import { JsonBlock, MessageText, StateDot } from '@deepseek-ai/dsh-client-ui-primitives'
@@ -19,7 +19,6 @@ import css from './MessageItem.module.css'
 export interface MessageItemProps {
  node:
    | UserMessageNode
-    | SteeringMessageNode
    | ContextMessageNode
    | CompactionSummaryNode
    | ModelRetryNode
@@ -227,7 +226,6 @@ export const MessageItem = memo(function MessageItem({
  const truncated = (total: number): string => t('json.truncated', { total })
  switch (node.kind) {
    case 'user':
-    case 'steering':
      return (
        <UserStyleBubble
          content={node.content}
@@ -87,7 +87,6 @@ export function messageBranchSeqs(
      nodeIndex++
    }
    if (tail?.kind === 'user'
-      || (tail?.kind === 'steering' && tail.turn === turn)
      || (tail?.kind === 'assistant' && tail.turn === turn && hasContentText(tail.blocks))) {
      result.add(tail.seq)
    }
@@ -1,6 +1,6 @@
 /**
 * Pure derivation of the terminal-card props from a frozen call slice: the
- * `card:'terminal'` render intent the bash tool declares arrives on the
+ * `card:'terminal'` render intent the shell tools declare arrives on the
 * snapshot as `callView`/`resultView`, and this is the one place that turns
 * that pair into what {@link TerminalBlock} draws. Both conversation render
 * sites (the chat tool row's expanded body and the details panel's Output
@@ -31,6 +31,9 @@ export const VARIANT_TITLES: Record<ToolRowVariant, string> = {
 /** Known tool name -> variant. */
 const TOOL_VARIANTS: Record<string, ToolRowVariant> = {
  bash: 'bash',
+  // The PowerShell twin is a shell tool: the bash row family (icon, colors)
+  // with its own title from TOOL_TITLES, not the generic `others` row.
+  pwsh: 'bash',
  read: 'read',
  web_fetch: 'read',
  web_search: 'search',
@@ -49,6 +52,7 @@ const TOOL_TITLES: Record<string, string> = {
  cordis_inspect: 'Inspect',
  cordis_mount: 'Mount temporary Plugin',
  cordis_unmount: 'Unmount temporary Plugin',
+  pwsh: 'Pwsh',
 }

 /**
@@ -191,6 +191,11 @@
  flex-direction: column;
  min-height: 0;
  overflow-y: auto;
+  /* Reserved unconditionally: the composer seat rides this box's content box in
+     Chat and its padding box under a view's composer overlay, so an `auto`
+     gutter moves the input card sideways by the bar's width whenever the two
+     differ ([decision](../../../../../../.agents/notes/implemented/bug-fix/2026-08-04-composer-tab-gutter-reservation.md)). */
+  scrollbar-gutter: stable;
 }

 .root[data-phase='active'] .viewArea {
@@ -221,7 +226,13 @@
   ownership of the seat geometry and its active-phase precedence. */
 .scrollBody:has([data-conversation-composer-overlay]) {
  position: relative;
-  overflow: hidden;
+  /* A clipping box nothing scrolls out of, stated as a scroll container on both
+     axes rather than `overflow: hidden`: WebKit honours the reservation above
+     only in the `overflow-y: auto` form, and a single-axis scroller computes
+     the other axis to `auto`
+     ([decision](../../../../../../.agents/notes/implemented/bug-fix/2026-08-04-composer-tab-gutter-reservation.md)). */
+  overflow-x: hidden;
+  overflow-y: auto;
 }

 .scrollBody:has([data-conversation-composer-overlay]) > .viewArea {
@@ -145,7 +145,7 @@ export function ConversationRoot({
      {hero && <HeroGlow className={css.heroGlow} />}
      {hero && <HeroShell t={t} />}
      {hero && heroWorkspaceRow}
-      {!hero && zone !== undefined && renderSlot('conversation.input.dock', zone)}
+      {zone !== undefined && renderSlot('conversation.input.dock', zone)}
      {inputBar}
    </div>
  )