@steerable/agent-shell-web 0.6.19 → 0.6.21

package/src/pages/AgentPage.tsx

@@ -26,7 +26,12 @@ import type { ExecutedAction } from "@/components/chat/ExecutedActionsCard";
 import type { ChildInfo } from "@/components/chat/OrchestrationChildrenCard";
 import { foldOrchestrationChildEvents } from "@/components/chat/orchestration-children-model";
 import { parseTurnBlocks, type TurnBlock } from "@/components/chat/turn-timeline";
+import { parseTurnFiles, type TurnFile } from "@/components/chat/turn-files";
 import { readPersistedDurationMs } from "@/components/chat/elapsed";
+import {
+  extractLatestSuggestedReplies,
+  type SuggestedRepliesState,
+} from "@/components/chat/suggested-replies-model";
 import { useChatTasks } from "@/components/chat/useChatTasks";
 import { LuListChecks, LuArrowRight } from "react-icons/lu";
 import { LocalLlmSettingsModal } from "@/components/LocalLlmSettingsModal";
@@ -136,6 +141,26 @@ function extractPersistedDurations(
   return seeded;
 }
 
+function extractPersistedTurnFiles(
+  messages: ChatMessageWithMetadata[] | undefined,
+): Record<string, TurnFile[]> {
+  const seeded: Record<string, TurnFile[]> = {};
+  if (!messages || messages.length === 0) return seeded;
+  for (const message of messages) {
+    if (message.role !== "assistant" || !message.messageMetadata) continue;
+    try {
+      const metadata = JSON.parse(message.messageMetadata) as {
+        turnFiles?: unknown;
+      };
+      const files = parseTurnFiles(metadata.turnFiles);
+      if (files) seeded[message.id] = files;
+    } catch {
+      // Ignore malformed legacy metadata.
+    }
+  }
+  return seeded;
+}
+
 /**
  * Routing layer for `/agent/:chatId`.
  *
@@ -205,6 +230,11 @@ function AgentChatLoader({
   const [initialDurations, setInitialDurations] = useState<
     Record<string, number>
   >({});
+  const [initialTurnFiles, setInitialTurnFiles] = useState<
+    Record<string, TurnFile[]>
+  >({});
+  const [initialSuggestedReplies, setInitialSuggestedReplies] =
+    useState<SuggestedRepliesState | null>(null);
   // W7-1: 后端在 messages 响应里下发 interrupted（上一轮崩溃/强杀中断）。
   const [initialInterrupted, setInitialInterrupted] = useState(false);
   // 运行中回合的实时快照：切走再切回时用它在历史消息之上叠出「正在运行」
@@ -234,10 +264,17 @@ function AgentChatLoader({
           getChatLiveStream(chatId),
         ]);
         if (cancelled) return;
-        setInitialMessages(chronological(response.messages));
+        const ordered = chronological(response.messages);
+        setInitialMessages(ordered);
         setInitialExecutedActions(extractPersistedActions(response.messages));
         setInitialTimelines(extractPersistedTimelines(response.messages));
         setInitialDurations(extractPersistedDurations(response.messages));
+        setInitialTurnFiles(extractPersistedTurnFiles(response.messages));
+        setInitialSuggestedReplies(
+          extractLatestSuggestedReplies(
+            ordered as ChatMessageWithMetadata[],
+          ),
+        );
         setInitialInterrupted(response.interrupted === true);
         setInitialLiveStream(live ?? { active: false });
       } catch (err) {
@@ -247,6 +284,8 @@ function AgentChatLoader({
         setInitialExecutedActions({});
         setInitialTimelines({});
         setInitialDurations({});
+        setInitialTurnFiles({});
+        setInitialSuggestedReplies(null);
         setInitialInterrupted(false);
         setInitialLiveStream({ active: false });
       }
@@ -271,6 +310,8 @@ function AgentChatLoader({
       initialExecutedActions={initialExecutedActions}
       initialTimelines={initialTimelines}
       initialDurations={initialDurations}
+      initialTurnFiles={initialTurnFiles}
+      initialSuggestedReplies={initialSuggestedReplies}
       initialInterrupted={initialInterrupted}
       initialLiveStream={initialLiveStream}
       hydrationError={hydrationError}
@@ -285,6 +326,8 @@ interface AgentChatViewProps {
   initialExecutedActions: Record<string, ExecutedAction[]>;
   initialTimelines: Record<string, TurnBlock[]>;
   initialDurations: Record<string, number>;
+  initialTurnFiles: Record<string, TurnFile[]>;
+  initialSuggestedReplies: SuggestedRepliesState | null;
   /** W7-1: 打开会话时上一轮处于中断态（崩溃/强杀，无完成记录）。 */
   initialInterrupted: boolean;
   /** 打开会话时的运行中回合快照（切回恢复运行状态用）。 */
@@ -299,6 +342,8 @@ function AgentChatView({
   initialExecutedActions,
   initialTimelines,
   initialDurations,
+  initialTurnFiles,
+  initialSuggestedReplies,
   initialInterrupted,
   initialLiveStream,
   hydrationError,
@@ -389,6 +434,16 @@ function AgentChatView({
   const [durationByMessageId, setDurationByMessageId] = useState<
     Record<string, number>
   >(initialDurations);
+  // 回合产物文件列表：与 executedActions 同款 reconcile 模式——live 回合
+  // 先挂 pendingTurnFilesRef，`message_id` 事件到达时归档到落库 id 上；
+  // 历史回合由 initialTurnFiles 从 messageMetadata.turnFiles 水合。
+  const [turnFilesByMessageId, setTurnFilesByMessageId] = useState<
+    Record<string, TurnFile[]>
+  >(initialTurnFiles);
+  // 当轮产物：turn_files 事件到达（流尾声）到 message_id 归档之间，以及
+  // 归档后占位 id 消息仍在屏上的这段时间，都靠它渲染尾部消息的文件列表。
+  const [currentTurnFiles, setCurrentTurnFiles] = useState<TurnFile[]>([]);
+  const pendingTurnFilesRef = useRef<TurnFile[]>([]);
   const turnStartedAtRef = useRef<number | null>(null);
   const [currentTurnStartedAtMs, setCurrentTurnStartedAtMs] = useState<
     number | undefined
@@ -425,6 +480,11 @@ function AgentChatView({
   const [planReady, setPlanReady] = useState(false);
   const planTurnRef = useRef(false);
   const wasStreamingRef = useRef(false);
+  const [suggestedReplies, setSuggestedReplies] =
+    useState<SuggestedRepliesState | null>(initialSuggestedReplies);
+  const [tailAssistantDbId, setTailAssistantDbId] = useState<string | null>(
+    initialSuggestedReplies?.messageId ?? null,
+  );
 
   const handleModeChange = useCallback((next: ChatMode) => {
     setMode(next);
@@ -459,6 +519,16 @@ function AgentChatView({
       }
       return;
     }
+    if (ev.event === "turn_files") {
+      // 回合收尾时后端发一次（在 message_id 之前）；先挂 pending，
+      // message_id 到达时随其他队列一起归档。
+      const files = parseTurnFiles(ev.payload?.files);
+      if (files) {
+        pendingTurnFilesRef.current = files;
+        setCurrentTurnFiles(files);
+      }
+      return;
+    }
     if (ev.event === "round_end") {
       // chat-transport surfaces `completion executing` as round_end. Bumping
       // the counter here is safe even if the round emits no tools — the
@@ -537,6 +607,15 @@ function AgentChatView({
         }));
       }
       pendingChildrenRef.current = [];
+      const queuedTurnFiles = pendingTurnFilesRef.current;
+      if (queuedTurnFiles.length > 0) {
+        setTurnFilesByMessageId((prev) => ({
+          ...prev,
+          [messageId]: queuedTurnFiles,
+        }));
+      }
+      pendingTurnFilesRef.current = [];
+      setTailAssistantDbId(messageId);
     }
     // AI 标题更新走的是后台 IPC 广播（chat-title-updated）而不是 SSE——
     // 见 AgentLayout 里的订阅。SSE 通道在 [DONE] 之后就不再监听了，title-gen
@@ -684,6 +763,8 @@ function AgentChatView({
       setCurrentTurnTimeline([]);
       pendingChildrenRef.current = [];
       setCurrentTurnChildren([]);
+      pendingTurnFilesRef.current = [];
+      setCurrentTurnFiles([]);
       setCurrentRound(1);
       const started = Date.now();
       turnStartedAtRef.current = started;
@@ -694,6 +775,8 @@ function AgentChatView({
       setPlanReady(false);
       // 手动发起新一轮即取代中断态——用户已经继续往前走了。
       setInterrupted(false);
+      setSuggestedReplies(null);
+      setTailAssistantDbId(null);
       // 模型选择器的每轮覆盖随 metadata 下发：model 覆盖设置里的全局
       // 模型；reasoningEffort 由 sidecar 按目录严格校验（不支持即报错，
       // 不静默丢弃）。都为 null 时保持设置/预制默认。
@@ -711,6 +794,26 @@ function AgentChatView({
     [sendUserMessage, modelOverride, effortOverride, execPolicy],
   );
 
+  const handleSelectSuggestion = useCallback(
+    (text: string) => {
+      void handleSubmit({ content: text });
+    },
+    [handleSubmit],
+  );
+
+  useEffect(() => {
+    const bridge = getElectronBridge();
+    if (!bridge?.onSuggestedReplies) return;
+    return bridge.onSuggestedReplies((payload) => {
+      if (payload.chatId !== chatId) return;
+      if (!Array.isArray(payload.suggestions) || payload.suggestions.length === 0) return;
+      setSuggestedReplies({
+        messageId: payload.messageId,
+        suggestions: payload.suggestions,
+      });
+    });
+  }, [chatId]);
+
   // 包槽位 fallback 发送通道（如文档包的单页修改在 sidecar 未就绪时把
   // 后端拼好的指令退回主聊天）：AgentLayout 持有发送器 ref，这里挂载时
   // 注册、卸载时注销，包面板经 sendChatMessage 调到当前注册的 handleSubmit。
@@ -732,6 +835,8 @@ function AgentChatView({
     setCurrentTurnTimeline([]);
     pendingChildrenRef.current = [];
     setCurrentTurnChildren([]);
+    pendingTurnFilesRef.current = [];
+    setCurrentTurnFiles([]);
     setCurrentRound(1);
     const started = Date.now();
     turnStartedAtRef.current = started;
@@ -863,6 +968,22 @@ function AgentChatView({
       )
     : currentTurnChildren;
 
+  let lastAssistantId: string | undefined;
+  for (let i = effectiveMessages.length - 1; i >= 0; i -= 1) {
+    if (effectiveMessages[i].role === "assistant") {
+      lastAssistantId = effectiveMessages[i].id;
+      break;
+    }
+  }
+  const visibleSuggestedReplies =
+    !effectiveIsStreaming &&
+    !interrupted &&
+    suggestedReplies &&
+    (suggestedReplies.messageId === lastAssistantId ||
+      suggestedReplies.messageId === tailAssistantDbId)
+      ? suggestedReplies.suggestions
+      : undefined;
+
   return (
     <div className="flex h-full w-full flex-col">
       {hydrationError && (
@@ -915,6 +1036,8 @@ function AgentChatView({
         currentTurnTimeline={effectiveCurrentTurnTimeline}
         currentTurnStartedAtMs={currentTurnStartedAtMs}
         durationByMessageId={durationByMessageId}
+        turnFilesByMessageId={turnFilesByMessageId}
+        currentTurnFiles={currentTurnFiles}
         currentTurnChildren={effectiveCurrentTurnChildren}
         orchestrationChildrenByMessageId={orchestrationChildrenByMessageId}
         currentRound={currentRound}
@@ -925,6 +1048,8 @@ function AgentChatView({
         onInspectTask={handleInspectTask}
         onDismissFinishedTask={dismissFinished}
         onShare={isElectron() ? handleShare : undefined}
+        suggestedReplies={visibleSuggestedReplies}
+        onSelectSuggestion={handleSelectSuggestion}
         onOpenSettings={
           isElectron() ? () => setLlmSettingsOpen(true) : undefined
         }

package/src/pages/ChatPanelPreviewPage.tsx

@@ -148,6 +148,7 @@ export function ChatPanelPreviewPage() {
     currentTurnStartedAtMs?: number;
     durationByMessageId?: Record<string, number>;
     currentRound: number;
+    suggestedReplies?: string[];
   }
   const config = useMemo<SceneConfig>(() => {
     switch (scene) {
@@ -203,6 +204,7 @@ export function ChatPanelPreviewPage() {
           timelineByMsgId: { m2: MOCK_TIMELINE },
           durationByMessageId: { m2: 83_000 },
           currentRound: 1,
+          suggestedReplies: ['修一下失败的断言颜色', '把测试再跑一遍', '解释这次失败的原因'],
         };
     }
   }, [scene]);
@@ -252,6 +254,8 @@ export function ChatPanelPreviewPage() {
           currentTurnStartedAtMs={config.currentTurnStartedAtMs}
           durationByMessageId={config.durationByMessageId}
           currentRound={config.currentRound}
+          suggestedReplies={config.suggestedReplies}
+          onSelectSuggestion={(text) => console.log('[preview] suggestion:', text)}
           onOpenSettings={() =>
             console.log('[preview] open llm settings (noop in harness)')
           }

package/vite.base.d.ts

@@ -0,0 +1,7 @@
+export interface ProductViteConfigOptions {
+    /** 产品目录（products/<id>/web 的上一级…即 products/<id>）。 */
+    productDir: string;
+    /** 产品 flavor（决定品牌 define 与激活包集合）。 */
+    flavor: string;
+}
+export declare function createProductViteConfig(options: ProductViteConfigOptions): import("vite").UserConfig;

package/vite.base.js

@@ -0,0 +1,83 @@
+/**
+ * 产品 web 构建的共享 vite 配置工厂（2.3）。
+ *
+ * 每个产品（products/<id>/web/）有自己的 vite 入口：index.html +
+ * main.tsx（静态注册本产品的包渲染层贡献）+ vite.config.ts（调本工厂）。
+ * 产品的编译单元只含自己的包——未激活包代码不进 bundle，不依赖树摇
+ * 正确性（物理隔离与 node 侧对称）。
+ *
+ * Electron 加载产物时走 file:// 协议，必须用相对路径，否则资源 404。
+ * dev server 跑在固定端口，主进程的 IS_DEV 分支 loadURL('http://localhost:5173')。
+ */
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import tailwindcss from '@tailwindcss/vite';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { existsSync, readFileSync } from 'node:fs';
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+export function createProductViteConfig(options) {
+    const { productDir, flavor } = options;
+    const repoRoot = path.resolve(productDir, '../..');
+    // shell 渲染层源码锚到本包自身（3.2 起住在框架仓库
+    // packages/agent-shell/web/src），产品经 `@/` 别名引用。
+    const webSrcDir = path.resolve(HERE, 'src');
+    const readJson = (p) => JSON.parse(readFileSync(p, 'utf8'));
+    // 产品品牌（3.1）：product.json 的 brand 字段优先（无包产品的品牌
+    // 来源）；否则取激活包 pack.json 的 brand（0.3g 机制，读
+    // products/manifest.json 的 flavor→包映射，第一个带 brand 的包）。
+    // 都没有则用 shell 中性默认（Agent Shell）。
+    const productJsonPath = path.join(productDir, 'product.json');
+    const product = existsSync(productJsonPath) ? readJson(productJsonPath) : {};
+    const manifest = readJson(path.join(repoRoot, 'products/manifest.json'));
+    let packBrand = null;
+    for (const packId of manifest.flavors?.[flavor] ?? []) {
+        const pack = readJson(path.join(repoRoot, 'packages', `pack-${packId}`, 'pack.json'));
+        if (pack.brand) {
+            packBrand = pack.brand;
+            break;
+        }
+    }
+    const brand = product.brand ?? packBrand;
+    return defineConfig({
+        // root 默认取 config 文件所在目录（products/<id>/web）。
+        base: './',
+        plugins: [react(), tailwindcss()],
+        define: {
+            // 显式 define 让 flavor 条件在构建期可静态折叠。
+            'import.meta.env.VITE_APP_FLAVOR': JSON.stringify(flavor),
+            // 品牌 define：产品/包声明覆盖 shell 中性默认（Agent Shell）。
+            // logo 不走 define——资产必须静态 import 才进 bundle，由包 web 模块
+            // 在注册时经 setBrandLogoUrl 注入（本包 src/brand.ts）。
+            'import.meta.env.VITE_BRAND_NAME': JSON.stringify(brand?.displayName ?? 'Steerable Shell'),
+            'import.meta.env.VITE_BRAND_TAGLINE': JSON.stringify(brand?.tagline ?? '一款本地桌面 AI 伙伴'),
+            'import.meta.env.VITE_DEFAULT_AGENT_ID': JSON.stringify(brand?.defaultAgentId ?? 'local-assistant'),
+        },
+        resolve: {
+            alias: {
+                // shell 渲染层源码（产品入口与包 web 模块都以 `@/` 引用它）。
+                '@': webSrcDir,
+            },
+        },
+        // 静态资产（favicon 等中性默认）随 shell web 包分发；产品可在自己的
+        // web root 放 public/ 覆盖（vite 不合并双 publicDir——需要产品级资产
+        // 时在产品 vite.config 里显式覆盖本字段）。
+        publicDir: path.resolve(HERE, 'public'),
+        server: {
+            port: 5173,
+            strictPort: true,
+            host: '127.0.0.1',
+            // 产品 root 在 products/<id>/web；shell 渲染层源码在框架仓库
+            // （3.2 起经 file: 依赖符号链接）——两个根都放行。
+            fs: { allow: [repoRoot, path.resolve(webSrcDir, '..')] },
+        },
+        build: {
+            // 产物落在产品目录：products/<id>/web/dist（打包期被 electron-builder
+            // 映射为包内 web-dist/）。
+            outDir: 'dist',
+            emptyOutDir: true,
+            sourcemap: true,
+            target: 'chrome120',
+        },
+    });
+}

package/src/brand.test.ts

@@ -1,22 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { LOCAL_ASSISTANT_AGENT_ID, pickDefaultAgentId } from './brand';
-
-describe('pickDefaultAgentId', () => {
-  const catalog = [
-    { id: LOCAL_ASSISTANT_AGENT_ID },
-    { id: 'data-analyst' },
-    { id: 'all-round-assistant' },
-  ];
-
-  it('returns null when the catalog is empty', () => {
-    expect(pickDefaultAgentId([])).toBeNull();
-  });
-
-  it('prefers the build-time default (shell: 电脑操作员) even when it is not first', () => {
-    expect(pickDefaultAgentId(catalog)).toBe(LOCAL_ASSISTANT_AGENT_ID);
-  });
-
-  it('falls back to the first visible agent when the build default is absent', () => {
-    expect(pickDefaultAgentId([{ id: 'writer' }, { id: 'reader' }])).toBe('writer');
-  });
-});