Merge origin/master into codex/todo-goal-queue-layout

packages/client/ui-conversation/src/client/apply.ts

@@ -165,7 +165,11 @@ export function apply(ctx: Context): void {
   // the resident parent keeps Hero and composer layout identity stable.
   slots.register({
     name: 'conversation.session',
-    children: { 'conversation.view': { kind: 'list', scope: 'session' } },
+    locale: NS,
+    children: {
+      'conversation.view': { kind: 'list', scope: 'session' },
+      'conversation.session.header.actions': { kind: 'list', scope: 'session' },
+    },
     store: chatStore,
     inject: (sessionId: SessionId, _actions: BoundActions<typeof chatStore>): ConversationSessionInjected => ({
       views: {
@@ -174,6 +178,7 @@ export function apply(ctx: Context): void {
         version: () => slots.getVersion('conversation.view'),
       },
       bindDraftMirror: write => inputHub.shell(sessionId).bindMirror(write),
+      open: (id) => { sessions.open(id) },
     }),
   }, ConversationSession)
 

packages/client/ui-conversation/src/client/contract/slots.ts

@@ -3,7 +3,7 @@ import type { ReactNode, RefObject } from 'react'
 import type {
   InjectFace, MaybeSnapshotSelectorHook, PropsLocale, PropsRenderSlots, PropsRuntime, PropsStore, SnapshotSelectorHook,
 } from '@deepseek-ai/dsh-client-ui-slots'
-import type { CommandNode, ConversationSnapshot, ObservableSnapshot, PendingInteraction, PendingWait, ToolCallBlock, WorkspaceId } from '@deepseek-ai/dsh-client-runtime/client'
+import type { CommandNode, ConversationSnapshot, ObservableSnapshot, PendingInteraction, PendingWait, SessionId, ToolCallBlock, WorkspaceId } from '@deepseek-ai/dsh-client-runtime/client'
 import type {} from '@deepseek-ai/dsh-client-ui-layout/client'
 import type { ComposerKeyboard, EditSelection, InputActions, InputNotice, InputState } from '../input/contract.ts'
 import type { createChatStore } from '../stores.ts'
@@ -17,6 +17,8 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
      * remounted when the current session id changes.
      */
     'conversation.session': { kind: 'single'; scope: 'session'; owner: ConversationSessionOwnerProps }
+    /** Session-header actions contributed by feature plugins. */
+    'conversation.session.header.actions': { kind: 'list'; scope: 'session'; owner: ConversationHeaderActionOwnerProps }
     /**
      * The conversation view ring: one list entry per view tab (chat here;
      * trajectory/waterfall from ui-trajectory), rendered one-at-a-time by
@@ -135,6 +137,9 @@ export interface ConversationSessionOwnerProps {
   wrapActiveBody?: (view: ReactNode) => ReactNode
 }
 
+/** Header actions derive their state from the standard session/global kit. */
+export interface ConversationHeaderActionOwnerProps {}
+
 /**
  * The input-region slot currency (plan §1.4): dock/left/right entries read
  * the conversation snapshot and the live input state as owner props (both
@@ -244,6 +249,8 @@ export interface ConversationSessionInjected {
   }
   /** Bind the input machine's draft persistence mirror to the session store. */
   bindDraftMirror: (write: (text: string) => void) => () => void
+  /** Select a real Session through the runtime navigation owner. */
+  open: (sessionId: SessionId) => void
 }
 
 /**
@@ -329,6 +336,8 @@ export type ComposerBarProps =
  */
 export interface ComposerChainProps {
   interactions: readonly PendingInteraction[]
+  /** Current conversation facts for feature-owned takeover selectors. */
+  session: ConversationSnapshot | undefined
 }
 
 /**
@@ -350,9 +359,10 @@ export type ConversationSlotProps =
 /** Full strict-session content props: per-session store, view ring, callbacks, and the locale seat. */
 export type ConversationSessionSlotProps =
   PropsRuntime<'conversation.session'>
-  & PropsRenderSlots<'conversation.view'>
+  & PropsRenderSlots<'conversation.view' | 'conversation.session.header.actions'>
   & PropsStore<ChatStore>
   & ConversationSessionInjected
+  & PropsLocale<'conversation'>
 
 /** The pending approval carrier the owner dispatches into the composer chain. */
 export type ApprovalWait = PendingWait<'approval'>

packages/client/ui-conversation/src/client/locales.ts

@@ -30,6 +30,7 @@ export const zh = {
   'access.confirm.enable': '启用 Full access',
   'hero.headline': '开始构建吧',
   'hero.chooseWorkspace': '选择工作区',
+  'session.hierarchy': '会话层级',
   'details.title': '详情',
   'details.close': '关闭详情',
   'details.empty': '点击消息流中的工具行查看详情',
@@ -129,6 +130,7 @@ export const en = {
   'access.confirm.enable': 'Enable Full access',
   'hero.headline': 'Let\'s start building',
   'hero.chooseWorkspace': 'Choose workspace',
+  'session.hierarchy': 'Session hierarchy',
   'details.title': 'Details',
   'details.close': 'Close details',
   'details.empty': 'Click a tool row in the message flow to view its details',

packages/client/ui-conversation/src/client/skeleton/ConversationRoot.module.css

@@ -1,4 +1,4 @@
-/* Conversation column skeleton: header (session title + tabs) over the view
+/* Conversation column skeleton: header (breadcrumb row only for subagents not fork + tabs) over the view
    area, composer InputBar at the bottom. Column width/squeeze is layout's;
    this fills its cell. Figma: Header 39:27730 (83px two-row), tabs 13px with
    a 3px active bar. */
@@ -26,21 +26,62 @@
 .titleRow {
   display: flex;
   align-items: center;
+  gap: 10px;
   min-height: 32px;
 }
-
-.sessionTitle {
+.crumbs {
+  display: flex;
+  align-items: center;
+  gap: 4px;
   min-width: 0;
-  max-width: 100%;
   overflow: hidden;
-  margin: 0;
-  padding: 4px 8px;
+  white-space: nowrap;
+}
+
+.crumbSeg {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+}
+
+.crumbSep {
+  /* figma: "/" separators are 14px caption gray (75:7903), one tint lighter than crumb text. */
+  color: var(--dsw-alias-label-caption);
   font-size: 14px;
   line-height: 20px;
-  font-weight: 500;
-  color: var(--dsw-alias-label-primary);
+}
+
+.crumb {
+  max-width: 220px;
+  overflow: hidden;
+  padding: 4px 8px;
+  border: none;
+  border-radius: 12px;
+  background: transparent;
+  font-size: 14px;
+  line-height: 20px;
+  color: var(--dsw-alias-label-tertiary);
   text-overflow: ellipsis;
   white-space: nowrap;
+  cursor: pointer;
+}
+
+.crumb:hover:not(:disabled) {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
+
+.crumbCurrent {
+  font-weight: 500;
+  color: var(--dsw-alias-label-primary);
+  cursor: default;
+}
+
+.headerActions {
+  display: flex;
+  flex: none;
+  align-items: center;
+  gap: 8px;
 }
 
 /* figma Tab_Group 34:11441: 35px strip, gap 36, pad-left 8, tabs bottom-aligned. */

packages/client/ui-conversation/src/client/skeleton/ConversationRoot.tsx

@@ -153,7 +153,7 @@ export function ConversationRoot({
   const phase = settling ? 'settling' : hero ? 'hero' : 'active'
   const composer = renderSlotChain(
     'conversation.composer',
-    { interactions: pending },
+    { interactions: pending, session },
     { fallback: composerBar, overlay: true },
   )
 

packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx

@@ -2,21 +2,51 @@
 
 import { useEffect, useSyncExternalStore, type ReactNode } from 'react'
 import clsx from 'clsx'
+import type { SessionId, SessionListState, SessionSummary } from '@deepseek-ai/dsh-client-runtime/client'
 import type { ConversationSessionSlotProps } from '../contract/slots.ts'
 import css from './ConversationRoot.module.css'
 
 /** Full props composed from the strict session slot contract. */
 export type ConversationSessionProps = ConversationSessionSlotProps
 
+interface Breadcrumb {
+  readonly id: SessionId
+  readonly displayTitle: string
+}
+
+function deriveAncestry(list: SessionListState, id: SessionId): readonly Breadcrumb[] {
+  const chain: Breadcrumb[] = []
+  const seen = new Set<SessionId>()
+  let cursor: SessionId | undefined = id
+  while (cursor !== undefined) {
+    if (seen.has(cursor)) break
+    seen.add(cursor)
+    const summary: SessionSummary | undefined = list.byId[cursor]
+    if (summary === undefined) break
+    chain.unshift({ id: summary.id, displayTitle: summary.displayTitle })
+    if (summary.origin !== 'subagent') break
+    cursor = summary.parentId
+  }
+  return chain
+}
+
+function equalBreadcrumbs(left: readonly Breadcrumb[], right: readonly Breadcrumb[]): boolean {
+  return left.length === right.length
+    && left.every((item, index) => {
+      const other = right.at(index)
+      return other !== undefined && item.id === other.id && item.displayTitle === other.displayTitle
+    })
+}
+
 export function ConversationSession({
   sessionId, useSession, useSessions, useInput, inputActions, useStore, actions,
-  renderSlot, views, bindDraftMirror, wrapActiveBody,
+  renderSlot, views, bindDraftMirror, open, wrapActiveBody, t,
 }: ConversationSessionProps) {
   useSyncExternalStore(views.subscribe, views.version)
   const tabs = views.list()
   const activeId = useStore(s => s.view) ?? 'chat'
   const active = tabs.find(view => view.id === activeId) ?? tabs[0]
-  const title = useSessions(s => s.byId[sessionId]?.displayTitle ?? sessionId)
+  const ancestry = useSessions(s => deriveAncestry(s, sessionId), equalBreadcrumbs)
   const composerPhase = useSession(s => s.composerPhase)
   const blank = useSession(s => s.blank)
   const inputState = useInput(s => s)
@@ -56,7 +86,28 @@ export function ConversationSession({
         {!hideChrome && (
           <>
             <div className={css.titleRow}>
-              <h1 className={css.sessionTitle}>{title}</h1>
+              <nav className={css.crumbs} aria-label={t('session.hierarchy')}>
+                {ancestry.map((summary, index) => {
+                  const last = index === ancestry.length - 1
+                  return (
+                    <span key={summary.id} className={css.crumbSeg}>
+                      {index > 0 && <span className={css.crumbSep}>/</span>}
+                      <button
+                        type="button"
+                        className={clsx(css.crumb, last && css.crumbCurrent)}
+                        disabled={last}
+                        onClick={() => { open(summary.id) }}
+                      >
+                        {summary.displayTitle}
+                      </button>
+                    </span>
+                  )
+                })}
+                {ancestry.length === 0 && <span className={css.crumbCurrent}>{sessionId}</span>}
+              </nav>
+              <div className={css.headerActions}>
+                {renderSlot('conversation.session.header.actions', {})}
+              </div>
             </div>
             {tabs.length > 1 && (
               <div className={css.tabs} role="tablist">

packages/client/ui-conversation/src/client/skeleton/InputBar.tsx

@@ -44,6 +44,7 @@ export function InputBar({
   const commandMenuOpen = useMenuLauncher(source => source === 'command')
   const promptError = useSession(s => s.promptError) ?? null
   const running = useSession(s => s.running) ?? false
+  const subagent = useSession(s => s.subagent) ?? null
   const removed = useSession(s => s.removed) ?? false
   // Plan mode swaps the textarea placeholder (the projection is the folded
   // host value; owner-prop placeholders — hero, session-unavailable — win).
@@ -283,13 +284,15 @@ export function InputBar({
     if (el !== null) toggleCommandMenu?.(selectionOf(el))
   }
 
-  const primaryLabel = running ? t('input.stop') : t('input.send')
+  const ordinary = subagent === null
+  const stopping = running && ordinary
+  const primaryLabel = stopping ? t('input.stop') : t('input.send')
   const onPrimary = (): void => {
-    if (inputActions === undefined || stop === undefined) return // absent machine: the button is disabled
-    if (running) {
-      stop()
+    if (stopping) {
+      stop?.()
       return
     }
+    if (inputActions === undefined) return // absent machine: the button is disabled
     /* v8 ignore next -- defensive: the primary button is disabled while empty||disabled, so a click cannot reach the false arm. */
     if (!empty && !disabled && !machineBusy) inputActions.submit()
   }
@@ -465,11 +468,11 @@ export function InputBar({
               className={css.primary}
               aria-label={primaryLabel}
               title={primaryLabel}
-              disabled={!running && (empty || disabled || machineBusy)}
+              disabled={stopping ? stop === undefined : empty || disabled || machineBusy}
               onMouseDown={keepFocus}
               onClick={onPrimary}
             >
-              {running ? (
+              {stopping ? (
                 <svg viewBox="0 0 16 16" width="16" height="16" aria-hidden>
                   <rect x="3" y="3" width="10" height="10" rx="3" fill="currentColor" />
                 </svg>