@steerable/agent-shell-web 0.6.51 → 0.6.53

package/src/components/chat/ChatInput.tsx

@@ -19,7 +19,6 @@ import {
   LuArrowUp,
   LuBot,
   LuChevronDown,
-  LuSettings,
   LuSquare,
   LuBlocks,
   LuPlug,
@@ -33,8 +32,9 @@ import {
 import type { LocalChat, LocalChatAgent } from '@/lib/local-api';
 import type { ExecPolicy } from '@/lib/exec-policy';
 import { getWebChatModes, hostToolCapability, settingsChrome } from '@/lib/host-tools';
-import { hostClipboardAvailable, requestHostPaste } from '@/lib/host-paste';
-import type { AttachmentFile } from '@/lib/attachments';
+import { hostClipboardAvailable, requestHostPaste, type HostClipboardFile } from '@/lib/host-paste';
+import { attachmentFromPath, type AttachmentFile } from '@/lib/attachments';
+import { dropPointHitsRect, hostFileDropAvailable, listenHostFileDrop } from '@/lib/host-file-drop';
 import type { SteerOutcome } from '@steerable/agent-ui';
 import {
   isHiddenSlashSkill,
@@ -61,7 +61,7 @@ export type { ExecPolicy, McpToolItem, SkillItem };
  *     product's `chat-input-box`).
  *   - Auto-growing rich text input (1 → 8 lines) that grows as the user types.
  *   - `Enter` to send, `Shift+Enter` for newline (`Cmd/Ctrl+Enter` also sends;
- *     IME composition is guarded so confirming a candidate never submits).
+ *     while streaming, Enter queues and Cmd/Ctrl+Enter steers the current turn).
  *   - Send button on the right; turns into a Stop button when streaming.
  *   - Externally-controlled value (`LocalChatPanel` lifts it so EmptyChat can
  *     inject prompts via `setAndFocusInputMessage`).
@@ -107,15 +107,15 @@ export interface ChatInputProps {
   onSubmit: () => void | Promise<void>;
   onCancel?: () => void;
   /**
-   * 轮中转向（streaming 期间 Enter）：优先把文本注入运行中的回合；注入
+   * 轮中插队（streaming 期间 ⌘/Ctrl+Enter）：优先把文本注入运行中的回合；注入
    * 失败由 hook 兜底——回合仍在跑则排入 W6-2 follow-up 队列（'queued'，
    * 本组件提示"已改为排队"），回合恰好已结束则作为新消息直接发出
    * （'sent'）。三种结果消息都已落地，调用方据此清空草稿。
    */
   onSteer?: (text: string) => Promise<SteerOutcome>;
   /**
-   * W6-2 follow-up 队列：streaming 期间按 ⌘/Ctrl+Enter 把当前文本排入
-   * 待发队列，本轮结束后自动作为下一轮发出（与 Enter 的轮中转向相对）。
+   * W6-2 follow-up 队列：streaming 期间按 Enter 把当前文本排入待发队列，
+   * 本轮结束后自动作为下一轮发出（与 ⌘/Ctrl+Enter 的轮中插队相对）。
    */
   onFollowUp?: (text: string) => void;
   /** 当前排队待发的 follow-up 文本（用于在输入框上方展示待发队列）。 */
@@ -715,6 +715,23 @@ function clipboardOf(event: ClipboardEvent<HTMLDivElement>): DataTransfer | null
   return native.clipboardData ?? event.clipboardData ?? null;
 }
 
+function fileFromHostClipboard(file: HostClipboardFile): File | null {
+  if (!file.dataBase64) return null;
+  let binary: string;
+  try {
+    binary = atob(file.dataBase64);
+  } catch {
+    return null;
+  }
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) {
+    bytes[index] = binary.charCodeAt(index);
+  }
+  return new File([bytes], file.name || 'image.png', {
+    type: file.mime || 'application/octet-stream',
+  });
+}
+
 function namePastedImage(file: File, serial: number, now: Date): File {
   if (!file.type.startsWith('image/')) return file;
   if (file.name.trim() && !GENERIC_CLIPBOARD_IMAGE_NAME.test(file.name.trim())) return file;
@@ -788,7 +805,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       chats = [],
       selectedAgentId,
       onSelectAgent,
-      onOpenSettings,
+      onOpenSettings: _onOpenSettings,
       toolbarExtras,
       leadingChrome,
       trailingChrome,
@@ -806,7 +823,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
     ref,
   ) {
     const askUserPrompt = useAskUserPrompt(chatId);
-    const approvalPrompt = useApprovalPrompt();
+    const approvalPrompt = useApprovalPrompt(chatId);
     const editorRef = useRef<HTMLDivElement>(null);
     const agentMenuRef = useRef<HTMLDivElement>(null);
     const skillOptionRefs = useRef<Array<HTMLButtonElement | null>>([]);
@@ -836,7 +853,11 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
     const compositionEndAtRef = useRef<number>(0);
 
     const fileInputRef = useRef<HTMLInputElement>(null);
+    const dropBoxRef = useRef<HTMLDivElement>(null);
     const pasteSerialRef = useRef(0);
+    const attachDroppedRef = useRef<(paths: string[]) => void>(() => {});
+    const dragHoverRef = useRef<(hovering: boolean) => void>(() => {});
+    const hostPasteFilesRef = useRef<(files: HostClipboardFile[]) => void>(() => {});
     const adoptPastedTextRef = useRef<(text: string) => void>(() => {});
     // 工具栏"空间不足时优先隐藏快捷键提示"的测量 refs，见下方 useLayoutEffect。
     const toolbarRowRef = useRef<HTMLDivElement>(null);
@@ -863,7 +884,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
     const [mentionQuery, setMentionQuery] = useState<MentionQuery | null>(null);
     const [selectedMentionIndex, setSelectedMentionIndex] = useState(0);
     const [mentionReferences, setMentionReferences] = useState<MentionReference[]>([]);
-    // 转向降级提示：Enter 转向失败被兜底进 W6-2 队列时告知用户"不是注入"，
+    // 插队降级提示：⌘/Ctrl+Enter 插队失败被兜底进 W6-2 队列时告知用户，
     // 几秒后自动消失（队列横幅本身常驻，提示只是动作反馈）。
     const [steerNotice, setSteerNotice] = useState<string | null>(null);
     const steerNoticeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -1145,15 +1166,17 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       }
     }, [value, mentionReferences, agents, chats, disabled, skills, mcpTools]);
 
-    // `Cmd+.` / `Ctrl+.` cancels the in-flight stream — matches macOS's
-    // conventional "interrupt" chord (Xcode, Terminal). Bound at the window
-    // level so users can hit it without the textarea being focused.
+    // Escape stops the current turn, matching Codex's graphical composer.
+    // Cmd/Ctrl+. remains as a compatibility alias. Bound at the window level
+    // so users can stop without the editor being focused.
     // Confined to the `isStreaming` window so it never fights with other
     // app-level shortcuts when the chat is idle.
     useEffect(() => {
       if (!isStreaming || !onCancel) return;
       const onKey = (event: globalThis.KeyboardEvent) => {
-        if ((event.metaKey || event.ctrlKey) && event.key === '.') {
+        const isStopAlias = (event.metaKey || event.ctrlKey) && event.key === '.';
+        const isEscape = event.key === 'Escape' && !event.metaKey && !event.ctrlKey && !event.altKey;
+        if (!event.defaultPrevented && (isStopAlias || isEscape)) {
           event.preventDefault();
           onCancel();
         }
@@ -1239,6 +1262,33 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       path: (file as { path?: string }).path || '',
       file,
     });
+    attachDroppedRef.current = (paths) => {
+      if (disabled || !allowFileAttach) return;
+      addFiles(paths.map(attachmentFromPath));
+    };
+    dragHoverRef.current = (hovering) => {
+      if (disabled || !allowFileAttach) {
+        setIsDragging(false);
+        return;
+      }
+      setIsDragging(hovering);
+    };
+    hostPasteFilesRef.current = (incoming) => {
+      if (disabled || !allowFileAttach) return;
+      const now = new Date();
+      const next: AttachmentFile[] = [];
+      for (const item of incoming) {
+        if (item.path) {
+          next.push(attachmentFromPath(item.path));
+          continue;
+        }
+        const blob = fileFromHostClipboard(item);
+        if (!blob) continue;
+        pasteSerialRef.current += 1;
+        next.push(toAttachment(namePastedImage(blob, pasteSerialRef.current, now)));
+      }
+      if (next.length > 0) addFiles(next);
+    };
 
     // 按钮点击 → 触发隐藏的 <input type="file" multiple>，由浏览器/Electron
     // 直接弹出系统文件选择框（不依赖 IPC，避免「点击无反应」）。
@@ -1448,14 +1498,44 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
         event.preventDefault();
         adoptPastedTextRef.current(text);
       };
+      const onHostPasteFiles = (event: Event) => {
+        const files = (event as CustomEvent<HostClipboardFile[]>).detail;
+        if (!Array.isArray(files) || files.length === 0) return;
+        event.preventDefault();
+        hostPasteFilesRef.current(files);
+      };
       editor.addEventListener('compositionstart', onCompositionStart, true);
       editor.addEventListener('hostpaste', onHostPaste);
+      editor.addEventListener('hostpastefiles', onHostPasteFiles);
       return () => {
         editor.removeEventListener('compositionstart', onCompositionStart, true);
         editor.removeEventListener('hostpaste', onHostPaste);
+        editor.removeEventListener('hostpastefiles', onHostPasteFiles);
       };
     }, []);
 
+    useEffect(() => {
+      if (!hostFileDropAvailable()) return undefined;
+      return listenHostFileDrop((event) => {
+        const box = dropBoxRef.current;
+        if (event.type === 'leave' || !box || event.x == null || event.y == null) {
+          dragHoverRef.current(false);
+          return;
+        }
+        const hit = dropPointHitsRect(
+          { x: event.x, y: event.y },
+          box.getBoundingClientRect(),
+          window.devicePixelRatio,
+        );
+        if (event.type === 'drop') {
+          dragHoverRef.current(false);
+          if (hit) attachDroppedRef.current(event.paths);
+          return;
+        }
+        dragHoverRef.current(hit);
+      });
+    }, []);
+
     const handlePaste = (event: ClipboardEvent<HTMLDivElement>) => {
       // Read before preventDefault. WebKit clears clipboardData once the paste is canceled.
       const data = clipboardOf(event);
@@ -1497,11 +1577,14 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
         requestHostPaste(event.currentTarget);
         return;
       }
-      // Honor IME composition (`isComposing` true while Chinese input is mid-
-      // selection) — only intercept on plain key events. Enter is exempt
-      // because WKWebView reports it with isComposing/keyCode 229 even after
-      // the candidate is committed.
-      if (event.key !== 'Enter' && (isComposingRef.current || event.nativeEvent.isComposing)) return;
+      // An open composition session owns the keystroke, including Enter used
+      // to confirm the highlighted candidate. Returning without
+      // preventDefault lets the IME commit the word. WKWebView can report
+      // isComposing / keyCode 229 on Enter after the session has already
+      // ended; that case is not an open session (`isComposingRef` is false)
+      // and must still send.
+      if (isComposingRef.current) return;
+      if (event.key !== 'Enter' && event.nativeEvent.isComposing) return;
 
       if (event.key === 'Backspace' || event.key === 'Delete') {
         const editor = editorRef.current;
@@ -1588,31 +1671,31 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
         }
       }
 
-      // Enter 发送，Shift+Enter 换行（⌘/Ctrl+Enter 作为老习惯保留，同样发送）。
+      // 空闲时 Enter / ⌘/Ctrl+Enter 发送，Shift+Enter 换行。
       // IME 候选确认的 Enter 已被上面的 composition 守卫拦截，不会误发送。
       const isSendCombo =
         event.key === 'Enter' && !event.shiftKey;
       if (isSendCombo) {
         event.preventDefault();
-        // streaming 期间：Enter = 轮中转向（注入运行中的回合；注入不了时
-        // hook 兜底为 W6-2 排队或新回合直发，消息不会丢）；⌘/Ctrl+Enter =
-        // follow-up 排队（本轮结束后自动作为下一轮发出）。
+        // streaming 期间：Enter = follow-up 排队（本轮结束后自动作为下一轮
+        // 发出）；⌘/Ctrl+Enter = 轮中插队（注入运行中的回合；注入不了时
+        // hook 兜底为 W6-2 排队或新回合直发，消息不会丢）。
         if (isStreaming) {
-          if ((event.metaKey || event.ctrlKey) && onFollowUp && trimmed) {
-            onFollowUp(trimmed);
-            onChange('');
-            return;
-          }
-          if (onSteer && trimmed) {
+          if ((event.metaKey || event.ctrlKey) && onSteer && trimmed) {
             void onSteer(trimmed).then((outcome) => {
               // steered / queued / sent 三种结果消息都已落地（注入当前回合 /
               // 进入待发队列 / 作为新回合发出），草稿都可以清；queued 额外
               // 提示用户"不是追加进当前回合"。
               if (outcome === 'queued') {
-                showSteerNotice('当前回合无法追加，已加入排队，本轮结束后自动发出');
+                showSteerNotice('当前回合无法插队，已改为排队，本轮结束后自动发出');
               }
               onChange('');
             });
+            return;
+          }
+          if (onFollowUp && trimmed) {
+            onFollowUp(trimmed);
+            onChange('');
           }
           return;
         }
@@ -1705,7 +1788,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
       <div className="chat-input-container @container relative px-2.5 pb-2.5 pt-1">
         {(leadingChrome || selectedAgent || trailingChrome) && (
           <div
-            className="relative mb-1.5 flex min-w-0 items-center gap-1.5"
+            className="relative mb-1.5 flex min-w-0 items-end gap-1.5"
             data-testid="composer-meta-row"
           >
             {leadingChrome}
@@ -1858,6 +1941,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
           </div>
         )}
         <div
+          ref={dropBoxRef}
           className={`chat-input-box flex flex-col rounded-agent-lg border bg-agent-canvas shadow-sm transition-all duration-200 ${
             isDragging
               ? 'border-blue-500 ring-2 ring-blue-500/20'
@@ -1872,7 +1956,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
           {pendingFollowUps.length > 0 && (
             <div className="flex flex-col gap-1 border-b border-agent-border bg-agent-muted/30 px-2.5 py-1.5">
               <div className="text-[11px] font-medium text-agent-muted-foreground">
-                排队中（{pendingFollowUps.length}）· 本轮结束后自动发出 · 停止将丢弃
+                排队中（{pendingFollowUps.length}）· 本轮结束后自动发出 · 停止后恢复到输入框
               </div>
               {pendingFollowUps.map((text, i) => (
                 <div
@@ -1993,18 +2077,6 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
               />
                 </>
               )}
-              {onOpenSettings && (
-                <button
-                  type="button"
-                  onClick={onOpenSettings}
-                  className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-agent-muted-foreground transition-colors hover:bg-agent-foreground/5 hover:text-agent-foreground"
-                  title="LLM 设置"
-                  aria-label="LLM 设置"
-                  data-testid="chat-llm-settings"
-                >
-                  <LuSettings className="h-3 w-3" />
-                </button>
-              )}
             </div>
             {/* shrink-0：发送键是固定尺寸圆钮，窄容器下不允许被压扁；
                 收缩量由左侧可截断的选择器吸收。 */}
@@ -2016,23 +2088,15 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
               >
                 {isStreaming ? (
                   <>
-                    <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
-                      {MOD_KEY_LABEL}
-                    </kbd>
-                    <span className="mx-0.5">+</span>
-                    <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
-                      .
-                    </kbd>
-                    <span className="ml-1">停止</span>
-                    {onSteer && (
+                    {onFollowUp && (
                       <span className="ml-2">
                         <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
                           Enter
                         </kbd>
-                        <span className="ml-1">追加</span>
+                        <span className="ml-1">排队</span>
                       </span>
                     )}
-                    {onFollowUp && (
+                    {onSteer && (
                       <span className="ml-2">
                         <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
                           {MOD_KEY_LABEL}
@@ -2041,9 +2105,15 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
                         <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
                           Enter
                         </kbd>
-                        <span className="ml-1">排队</span>
+                        <span className="ml-1">插队</span>
                       </span>
                     )}
+                    <span className="ml-2">
+                      <kbd className="rounded border border-agent-border bg-agent-muted px-1 font-sans text-[10px]">
+                        Esc
+                      </kbd>
+                      <span className="ml-1">停止</span>
+                    </span>
                   </>
                 ) : (
                   <>
@@ -2079,8 +2149,8 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
                 title={
                   isStreaming
                     ? pendingFollowUps.length > 0
-                      ? `停止生成 (${MOD_KEY_LABEL}+.) · 将丢弃 ${pendingFollowUps.length} 条排队消息`
-                      : `停止生成 (${MOD_KEY_LABEL}+.)`
+                      ? `停止生成 (Esc) · ${pendingFollowUps.length} 条排队消息将恢复到输入框`
+                      : '停止生成 (Esc)'
                     : '发送 (Enter)'
                 }
                 aria-label={isStreaming ? '停止生成' : '发送消息'}
@@ -2291,7 +2361,7 @@ function AgentSelect({
             data-testid="agent-manage"
             onClick={() => {
               onOpenChange(false);
-              navigate('/settings?section=agents');
+              navigate('/settings?section=plugins&tab=agents');
             }}
             className="mt-0.5 flex w-full items-center gap-2 rounded border-t border-agent-border/50 px-2 py-2 text-left text-agent-muted-foreground transition-colors hover:bg-agent-foreground/5 hover:text-agent-foreground"
           >

package/src/components/chat/ChatProjectBadge.tsx

@@ -241,7 +241,7 @@ export function ChatProjectBadge({
         title={
           project
             ? `${project.folderPath}\n点击管理项目归属 / 修改绑定目录`
-            : '把当前对话关联到一个项目（Agent 的文件操作将限制在项目目录内）'
+            : '把当前对话关联到一个项目（文件写入限制在项目家目录、源文件夹，以及这些目录的子目录内）'
         }
       />
 

package/src/components/chat/EmptyChatHero.tsx

@@ -0,0 +1,22 @@
+import { BRAND_HOME_HINT, BRAND_NAME, getBrandLogoUrl } from '@/brand';
+
+/**
+ * 新对话落地页与空会话首屏的品牌区：侧栏同一枚 logo，加一句
+ * 产品可配的副文案（brand.homeHint）。
+ */
+export function EmptyChatHero() {
+  const hint = BRAND_HOME_HINT.trim();
+  return (
+    <div className="text-center">
+      <h1>
+        <img
+          src={getBrandLogoUrl()}
+          alt={BRAND_NAME}
+          className="mx-auto h-12 w-auto max-w-[12rem] select-none object-contain"
+          draggable={false}
+        />
+      </h1>
+      {hint ? <p className="mt-1.5 text-xs text-agent-muted-foreground">{hint}</p> : null}
+    </div>
+  );
+}

package/src/components/chat/ExecPolicyPicker.tsx

@@ -6,7 +6,7 @@ import type { ExecPolicy } from '@/lib/exec-policy';
  * ExecPolicyPicker — 输入框上的命令沙箱切换（类 Codex 底部权限档）。
  *
  * 切档立刻记住，下一轮才生效：当前回合的 `execSandbox` 已经随流发出。
- * 工作区 = Seatbelt/bwrap 只允许写项目家目录或本对话工作区；完整权限
+ * 工作区 = Seatbelt/bwrap 只允许写项目家目录、源文件夹（含各自子目录）或本对话工作区；完整权限
  * = 不下发命令沙箱，本机路径（如 Downloads）不再被 Operation not permitted 拦住。
  */
 
@@ -19,7 +19,7 @@ const OPTIONS: Array<{
     id: 'workspace',
     label: '工作区',
     description:
-      '命令只能写入当前项目或本对话工作区（文稿/<应用名>/conversations/）；工作区外路径会被系统拒绝。',
+      '只能写入当前工作区，范围外的路径会被拒绝。',
   },
   {
     id: 'full',

package/src/components/chat/ExecutedActionsCard.tsx

@@ -59,6 +59,16 @@ export interface ExecutedAction {
    * port-only egress); none = no backend on this platform.
    */
   sandbox?: { backend?: string; enforcement: string };
+  /**
+   * 工具注册时声明的卡片。`declared` 为真时行标题用 `title`，
+   * 不再按工具名猜测。旧事件没有这个字段，仍走原来的摘要。
+   */
+  view?: {
+    card: 'generic' | 'terminal' | 'diff' | 'search' | 'read' | 'web';
+    kind: string;
+    title: string;
+    declared: boolean;
+  };
 }
 
 export interface ExecutedActionsCardProps {
@@ -124,18 +134,18 @@ function actionToTool(action: ExecutedAction, idx: number): ToolExecutionPayload
         ? humanizeDelegateError(env.error)
         : env.error
       : null;
-  // W5-2: web_search/web_fetch 用结构化中文摘要（查询词/URL + 结果计数/
-  // 状态码），其余工具走通用参数摘要。
-  const summary =
-    (action.tool === 'delegate_subagent'
-      ? summarizeDelegateSubagent(action.arguments)
-      : null) ??
-    (isTaskFamilyTool(action.tool)
-      ? summarizeTaskAction(action.tool, action.arguments, action.result)
-      : null) ??
-    summarizeRunCodeAction(action.tool, action.arguments, action.result) ??
-    summarizeWebAction(action.tool, action.arguments, action.result) ??
-    summarizeArguments(action.arguments);
+  // 声明过的工具用 view.title。没有 view 的旧事件仍按工具名做摘要。
+  const summary = action.view?.declared
+    ? action.view.title
+    : ((action.tool === 'delegate_subagent'
+        ? summarizeDelegateSubagent(action.arguments)
+        : null) ??
+      (isTaskFamilyTool(action.tool)
+        ? summarizeTaskAction(action.tool, action.arguments, action.result)
+        : null) ??
+      summarizeRunCodeAction(action.tool, action.arguments, action.result) ??
+      summarizeWebAction(action.tool, action.arguments, action.result) ??
+      summarizeArguments(action.arguments));
   const badge = sandboxBadge(action.sandbox);
   return {
     id: action.id ?? `${action.tool}-${idx}`,

package/src/components/chat/LocalChatPanel.tsx

@@ -11,6 +11,7 @@ import {
   type MentionReference,
 } from './ChatInput';
 import { EmptyChat } from './EmptyChat';
+import { EmptyChatHero } from './EmptyChatHero';
 import { MessageList } from './MessageList';
 import type { ExecutedAction } from './ExecutedActionsCard';
 import type { InspectTaskInput } from './executed-actions-model';
@@ -18,6 +19,7 @@ import type { ChildInfo } from './OrchestrationChildrenCard';
 import type { TurnBlock } from './turn-timeline';
 import type { TurnFile } from './turn-files';
 import type { LlmSpeedSnapshot } from './process-status';
+import { ComposerStatusStack } from './composer-status-stack';
 import { SessionTodoList } from './SessionTodoList';
 import { resolveLatestSessionTodos } from './todo-list-model';
 import { SessionOrchestrationFlow } from './SessionOrchestrationFlow';
@@ -59,9 +61,9 @@ export interface LocalChatPanelProps {
   isStreaming?: boolean;
   onSubmit: (input: { content: string; metadata?: Record<string, unknown> }) => void | Promise<void>;
   onCancel?: () => void;
-  /** 轮中转向（streaming 期间 Enter）：注入失败由 hook 兜底为排队/直发，见 ChatInput。 */
+  /** 轮中插队（streaming 期间 ⌘/Ctrl+Enter）：注入失败由 hook 兜底为排队/直发。 */
   onSteer?: (text: string) => Promise<SteerOutcome>;
-  /** W6-2 follow-up 排队：streaming 期间 ⌘/Ctrl+Enter 把文本排入待发队列。 */
+  /** W6-2 follow-up 排队：streaming 期间 Enter 把文本排入待发队列。 */
   onFollowUp?: (text: string) => void;
   /** 排队待发的 follow-up 文本列表。 */
   pendingFollowUps?: string[];
@@ -78,11 +80,11 @@ export interface LocalChatPanelProps {
   /** Slot rendered above the message list (header / agent picker / …). */
   header?: ReactNode;
   /**
-   * 空会话 hero 布局：提供后，当 messages 为空且未在流式时，整个面板渲染为
-   * 居中首屏（品牌标题 + 居中输入框，无 header）——与 /agent 落地页
-   * （EmptyChatGate）同款视觉。首条消息落地后自动切回常规布局。
+   * 空会话 hero 布局：为 true 时，当 messages 为空且未在流式时，整个面板渲染为
+   * 居中首屏（品牌 logo + brand.homeHint + 居中输入框，无 header）——与 /agent
+   * 落地页（EmptyChatGate）同款视觉。首条消息落地后自动切回常规布局。
    */
-  emptyHero?: { title: string; subtitle?: string };
+  emptyHero?: boolean;
   /** Override the default `EmptyChat` empty-state. */
   emptyState?: ReactNode;
   /** Disable the input (e.g. during initial chat-history load). */
@@ -339,6 +341,7 @@ export function LocalChatPanel({
         orchestrationChildrenByMessageId,
         timelineByMessageId,
         currentTurnTimeline,
+        turnActive: isStreaming,
       }),
     [
       messages,
@@ -348,6 +351,7 @@ export function LocalChatPanel({
       orchestrationChildrenByMessageId,
       timelineByMessageId,
       currentTurnTimeline,
+      isStreaming,
     ],
   );
 
@@ -378,6 +382,17 @@ export function LocalChatPanel({
     // inputBox 并重新 observe，否则气泡宽度变量停在旧节点上。
   }, [showEmptyHero]);
 
+  const handleCancel = useCallback(() => {
+    if (pendingFollowUps && pendingFollowUps.length > 0) {
+      setInputValue((draft) =>
+        [...pendingFollowUps, draft.trim()]
+          .filter(Boolean)
+          .join('\n\n'),
+      );
+    }
+    onCancel?.();
+  }, [onCancel, pendingFollowUps]);
+
   const chatInputNode = (
     <>
       {attachmentError && (
@@ -394,7 +409,7 @@ export function LocalChatPanel({
         value={inputValue}
         onChange={setInputValue}
         onSubmit={handleSubmit}
-        onCancel={onCancel}
+        onCancel={handleCancel}
         onSteer={onSteer}
         onFollowUp={onFollowUp}
         pendingFollowUps={pendingFollowUps}
@@ -416,7 +431,7 @@ export function LocalChatPanel({
         leadingChrome={inputLeadingChrome}
         trailingChrome={
           sessionOrchestrationFlow || sessionTodos ? (
-            <div className="flex items-center gap-1.5 min-w-0">
+            <ComposerStatusStack>
               {sessionOrchestrationFlow ? (
                 <SessionOrchestrationFlow
                   flow={sessionOrchestrationFlow}
@@ -425,7 +440,7 @@ export function LocalChatPanel({
                 />
               ) : null}
               {sessionTodos ? <SessionTodoList todos={sessionTodos} /> : null}
-            </div>
+            </ComposerStatusStack>
           ) : undefined
         }
         mode={mode}
@@ -453,16 +468,7 @@ export function LocalChatPanel({
         {showEmptyHero ? (
           <div className="flex min-h-0 flex-1 items-center justify-center p-3 sm:p-5">
             <div className="flex w-full max-w-3xl flex-col items-center gap-4">
-              <div className="text-center">
-                <h1 className="text-xl font-semibold tracking-tight text-agent-foreground">
-                  {emptyHero?.title}
-                </h1>
-                {emptyHero?.subtitle && (
-                  <p className="mt-1.5 text-xs text-agent-muted-foreground">
-                    {emptyHero.subtitle}
-                  </p>
-                )}
-              </div>
+              <EmptyChatHero />
               <div className="w-full">
                 {inputBanner}
                 {chatInputNode}