@steerable/agent-shell-web 0.6.50 → 0.6.52

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,9 +59,19 @@ 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;
+  };
 }
 
-interface ExecutedActionsCardProps {
+export interface ExecutedActionsCardProps {
   actions: ExecutedAction[];
   /** Drop the outer card chrome when nested in a turn-process group. */
   compact?: boolean;
@@ -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,8 +19,11 @@ 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';
+import { resolveLatestSessionOrchestrationFlow } from './orchestration-flow-model';
 import {
   appendAttachmentRefs,
   collectImageAttachments,
@@ -57,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[];
@@ -76,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). */
@@ -327,6 +331,30 @@ export function LocalChatPanel({
     ],
   );
 
+  const sessionOrchestrationFlow = useMemo(
+    () =>
+      resolveLatestSessionOrchestrationFlow({
+        messages,
+        executedActionsByMessageId,
+        currentTurnActions,
+        currentTurnChildren,
+        orchestrationChildrenByMessageId,
+        timelineByMessageId,
+        currentTurnTimeline,
+        turnActive: isStreaming,
+      }),
+    [
+      messages,
+      executedActionsByMessageId,
+      currentTurnActions,
+      currentTurnChildren,
+      orchestrationChildrenByMessageId,
+      timelineByMessageId,
+      currentTurnTimeline,
+      isStreaming,
+    ],
+  );
+
   // Sync `chat-input-box-width` CSS var so bubbles match the input width
   // (mirrors the rendered input box width so message bubbles + input visually align in a column).
   const containerRef = useRef<HTMLDivElement>(null);
@@ -354,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 && (
@@ -370,7 +409,7 @@ export function LocalChatPanel({
         value={inputValue}
         onChange={setInputValue}
         onSubmit={handleSubmit}
-        onCancel={onCancel}
+        onCancel={handleCancel}
         onSteer={onSteer}
         onFollowUp={onFollowUp}
         pendingFollowUps={pendingFollowUps}
@@ -390,7 +429,20 @@ export function LocalChatPanel({
         onOpenSettings={onOpenSettings}
         toolbarExtras={inputToolbarExtras}
         leadingChrome={inputLeadingChrome}
-        trailingChrome={sessionTodos ? <SessionTodoList todos={sessionTodos} /> : undefined}
+        trailingChrome={
+          sessionOrchestrationFlow || sessionTodos ? (
+            <ComposerStatusStack>
+              {sessionOrchestrationFlow ? (
+                <SessionOrchestrationFlow
+                  flow={sessionOrchestrationFlow}
+                  chatId={chatId}
+                  onInspectTask={onInspectTask}
+                />
+              ) : null}
+              {sessionTodos ? <SessionTodoList todos={sessionTodos} /> : null}
+            </ComposerStatusStack>
+          ) : undefined
+        }
         mode={mode}
         onModeChange={onModeChange}
         execPolicy={execPolicy}
@@ -416,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}

package/src/components/chat/MessageList.tsx

@@ -2,6 +2,7 @@ import {
   useCallback,
   useEffect,
   useLayoutEffect,
+  useMemo,
   useRef,
   useState,
   type ReactNode,
@@ -245,6 +246,43 @@ export function MessageList({
     scrollToBottom('auto');
   }, [lastMessageId, lastContentLen, lastTimelineSig, suggestedSig, scrollToBottom]);
 
+  // Group consecutive user messages into turns (方案 A).
+  // A group of 2+ user messages renders as a single connected card with
+  // dividers and "↳ 追加" badges, instead of separate disconnected bubbles.
+  type MessageItem =
+    | { type: 'user-group'; messages: ChatMessage[]; key: string }
+    | { type: 'assistant'; message: ChatMessage; originalIndex: number };
+
+  const groupedItems = useMemo<MessageItem[]>(() => {
+    const items: MessageItem[] = [];
+    let currentUserGroup: ChatMessage[] = [];
+
+    for (let i = 0; i < visibleMessages.length; i++) {
+      const msg = visibleMessages[i];
+      if (msg.role === 'user') {
+        currentUserGroup.push(msg);
+      } else {
+        if (currentUserGroup.length > 0) {
+          items.push({
+            type: 'user-group',
+            messages: currentUserGroup,
+            key: `ug-${currentUserGroup[0].id}`,
+          });
+          currentUserGroup = [];
+        }
+        items.push({ type: 'assistant', message: msg, originalIndex: i });
+      }
+    }
+    if (currentUserGroup.length > 0) {
+      items.push({
+        type: 'user-group',
+        messages: currentUserGroup,
+        key: `ug-${currentUserGroup[0].id}`,
+      });
+    }
+    return items;
+  }, [visibleMessages]);
+
   return (
     <div className="relative flex-1 overflow-hidden">
       <div
@@ -255,11 +293,45 @@ export function MessageList({
           emptyState ?? null
         ) : (
           <div className="mx-auto w-full max-w-3xl space-y-4">
-            {visibleMessages.map((message, index) => {
-              const isLast = index === visibleMessages.length - 1;
-              if (message.role === 'user') {
-                return <UserMessage key={message.id} message={message} agents={agents} chats={chats} />;
+            {groupedItems.map((item) => {
+              if (item.type === 'user-group') {
+                if (item.messages.length === 1) {
+                  return (
+                    <UserMessage
+                      key={item.messages[0].id}
+                      message={item.messages[0]}
+                      agents={agents}
+                      chats={chats}
+                    />
+                  );
+                }
+                // Multiple consecutive user messages: render as a unified combined card.
+                return (
+                  <div
+                    key={item.key}
+                    className="group/user-group"
+                    data-message-role="user-group"
+                  >
+                    <div className="flex justify-start">
+                      <div className="mx-auto w-full max-w-[var(--chat-input-box-width)] overflow-hidden rounded-agent-lg border border-agent-border/80 bg-agent-muted/70 shadow-sm">
+                        {item.messages.map((msg, idx) => (
+                          <UserMessage
+                            key={msg.id}
+                            message={msg}
+                            agents={agents}
+                            chats={chats}
+                            isGrouped
+                            isAppended={idx > 0}
+                          />
+                        ))}
+                      </div>
+                    </div>
+                  </div>
+                );
               }
+
+              const message = item.message;
+              const isLast = item.originalIndex === visibleMessages.length - 1;
               // Action attribution: prefer the per-message map (set when the
               // backend's `message_id` event reconciles the stream-time queue
               // with the DB id). The framework keeps the in-flight assistant's
@@ -309,7 +381,7 @@ export function MessageList({
                   : undefined;
               let previousUser: ChatMessage | undefined;
               let previousUserCreatedAt: string | undefined;
-              for (let i = index - 1; i >= 0; i -= 1) {
+              for (let i = item.originalIndex - 1; i >= 0; i -= 1) {
                 if (visibleMessages[i].role === 'user') {
                   previousUser = visibleMessages[i];
                   previousUserCreatedAt = previousUser.createdAt;

package/src/components/chat/ModelPicker.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { LuChevronDown, LuRefreshCw } from 'react-icons/lu';
+import { LuChevronDown, LuRefreshCw, LuSettings } from 'react-icons/lu';
 import { ModelCapabilityChips } from '@/components/settings/ModelCapabilityChips';
 import {
   getLlmModels,
@@ -32,6 +32,8 @@ export interface ModelPickerProps {
   reasoningEffort: string | null;
   onSelectModel: (model: string | null) => void;
   onSelectEffort: (effort: string | null) => void;
+  /** 打开 LLM 设置弹窗。 */
+  onOpenSettings?: () => void;
   disabled?: boolean;
 }
 
@@ -40,6 +42,7 @@ export function ModelPicker({
   reasoningEffort,
   onSelectModel,
   onSelectEffort,
+  onOpenSettings,
   disabled = false,
 }: ModelPickerProps) {
   const [catalog, setCatalog] = useState<GatewayModelCatalog | null>(null);
@@ -109,6 +112,7 @@ export function ModelPicker({
       <div className="relative flex min-w-0">
         <button
           type="button"
+          data-testid="model-picker"
           onClick={() => {
             const next = !modelMenuOpen;
             setModelMenuOpen(next);
@@ -155,6 +159,22 @@ export function ModelPicker({
                 >
                   <LuRefreshCw className={`h-3 w-3 ${loading ? 'animate-spin' : ''}`} />
                 </button>
+                {onOpenSettings && (
+                  <button
+                    type="button"
+                    onClick={() => {
+                      onOpenSettings();
+                      setModelMenuOpen(false);
+                      setEffortMenuOpen(false);
+                    }}
+                    className="flex h-4 w-4 items-center justify-center rounded text-agent-muted-foreground transition-colors hover:text-agent-foreground"
+                    title="LLM 设置"
+                    aria-label="LLM 设置"
+                    data-testid="chat-llm-settings"
+                  >
+                    <LuSettings className="h-3 w-3" />
+                  </button>
+                )}
               </span>
             </div>
             <button