@steerable/agent-shell-web 0.6.33 → 0.6.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-shell-web",
-  "version": "0.6.33",
+  "version": "0.6.35",
   "type": "module",
   "description": "Steerable framework — product-neutral renderer SPA source for @steerable/agent-shell (React + Vite). Consumed by product web entry points via the `@/` alias (anchored at this package's src/) and the createProductViteConfig factory. Published as a source package (src/), plus the compiled vite.base config factory (vite.base.js + .d.ts) for Node-side config loading.",
   "license": "Apache-2.0",
@@ -43,8 +43,8 @@
     "react-router-dom": "^6.30.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",
-    "@steerable/agent-protocol": "0.6.33",
-    "@steerable/agent-ui": "0.6.33"
+    "@steerable/agent-ui": "0.6.35",
+    "@steerable/agent-protocol": "0.6.35"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.3.0",
@@ -57,7 +57,7 @@
     "typescript": "^5.8.3",
     "vite": "^5.4.21",
     "vitest": "^3.2.4",
-    "@steerable/pack-sdk": "0.6.33"
+    "@steerable/pack-sdk": "0.6.35"
   },
   "scripts": {
     "gen": "echo agent-shell-web",

package/src/components/chat/ChatInput.tsx

@@ -32,7 +32,7 @@ import {
 } from 'react-icons/lu';
 import type { LocalChat, LocalChatAgent } from '@/lib/local-api';
 import type { ExecPolicy } from '@/lib/exec-policy';
-import { getWebChatModes, hostToolChrome, settingsChrome } from '@/lib/host-tools';
+import { getWebChatModes, hostToolCapability, settingsChrome } from '@/lib/host-tools';
 import type { AttachmentFile } from '@/lib/attachments';
 import type { SteerOutcome } from '@steerable/agent-ui';
 import {
@@ -1113,7 +1113,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
     const trimmed = value.trim();
     const canSend = (trimmed.length > 0 || actualFiles.length > 0) && !disabled && !isStreaming;
 
-    const allowFileAttach = hostToolChrome('local-fs');
+    const allowFileAttach = hostToolCapability('local-fs');
 
     const handleDragOver = (event: React.DragEvent) => {
       event.preventDefault();
@@ -1844,6 +1844,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
                 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 disabled:cursor-not-allowed disabled:opacity-50"
                 title="上传文件（可多选）"
                 aria-label="上传文件"
+                data-testid="chat-attach"
               >
                 <LuPaperclip className="h-3 w-3" />
               </button>

package/src/components/chat/LocalChatPanel.tsx

@@ -21,7 +21,7 @@ import type { LlmSpeedSnapshot } from './process-status';
 import { SessionTodoList } from './SessionTodoList';
 import { resolveLatestSessionTodos } from './todo-list-model';
 import {
-  isImageFile,
+  composeAttachmentUserContent,
   saveChatAttachments,
   type AttachmentFile,
 } from '@/lib/attachments';
@@ -235,16 +235,8 @@ export function LocalChatPanel({
     // 自行持久化，这里 chatId 为空时原样用源路径。
     const resolvedFiles =
       chatId && files.length > 0 ? await saveChatAttachments(chatId, files) : files;
-
-    // Append file references to the user message content
-    if (resolvedFiles.length > 0) {
-      const fileRefs = resolvedFiles.map(f => `- \`${f.path}\``).join('\n');
-      if (trimmed) {
-        trimmed = `${trimmed}\n\n---\n关联文件:\n${fileRefs}`;
-      } else {
-        trimmed = `关联文件:\n${fileRefs}`;
-      }
-    }
+    const assembled = composeAttachmentUserContent(trimmed, resolvedFiles);
+    trimmed = assembled.content;
 
     const mentionedAgentIds = mentionReferences
       .filter((ref) => ref.type === 'agent')
@@ -255,16 +247,13 @@ export function LocalChatPanel({
     // W6-3: image attachments ride as metadata so the main process reads the
     // bytes into base64 ImageParts; the text path refs above stay so the
     // persisted record reflects that an image was attached.
-    const imageAttachments = resolvedFiles
-      .filter((f) => isImageFile(f.path))
-      .map((f) => ({ path: f.path, name: f.name }));
     const metadata = {
       ...(mode === 'plan' ? { mode: 'plan' as const } : {}),
       ...(execPolicy === 'full' ? { execPolicy: 'full' as const } : {}),
       ...(selectedAgentId ? { agentId: selectedAgentId } : {}),
       ...(mentionedAgentIds.length > 0 ? { mentionedAgentIds } : {}),
       ...(referencedChatIds.length > 0 ? { referencedChatIds } : {}),
-      ...(imageAttachments.length > 0 ? { images: imageAttachments } : {}),
+      ...(assembled.images.length > 0 ? { images: assembled.images } : {}),
     };
 
     // Snapshot what we're about to clear so a failed submit can restore it —

package/src/lib/attachments.ts

@@ -9,7 +9,7 @@
  *   - BS/browser：File 没有路径，这里把字节读成 base64 走 HTTP 端点落盘。
  * 返回的落盘路径会重写消息正文里的文件引用与图像附件元数据。
  */
-import { getElectronBridge, isElectron } from './electron-bridge';
+import { getElectronBridge } from './electron-bridge';
 
 export interface AttachmentFile {
   name: string;
@@ -39,17 +39,41 @@ export async function fileToBase64(file: File): Promise<string> {
   return btoa(binary);
 }
 
+/** 正文引用：优先落盘路径，浏览器未落盘时退回文件名（避免写成空的 ``）。 */
+export function attachmentRefLabel(file: AttachmentFile): string {
+  return file.path || file.name;
+}
+
+/**
+ * 把附件写进用户消息：正文「关联文件」列表 + 图像 metadata。
+ * 只收录有路径或文件名的项。
+ */
+export function composeAttachmentUserContent(
+  text: string,
+  files: AttachmentFile[],
+): { content: string; images: Array<{ path: string; name: string }> } {
+  const usable = files.filter((file) => attachmentRefLabel(file));
+  let content = text.trim();
+  if (usable.length > 0) {
+    const fileRefs = usable.map((file) => `- \`${attachmentRefLabel(file)}\``).join('\n');
+    content = content ? `${content}\n\n---\n关联文件:\n${fileRefs}` : `关联文件:\n${fileRefs}`;
+  }
+  const images = usable
+    .filter((file) => isImageFile(file.path || file.name))
+    .map((file) => ({ path: attachmentRefLabel(file), name: file.name }));
+  return { content, images };
+}
+
 /**
  * 把一批附件持久化到会话附件目录，返回「提交时应使用」的文件列表：
  * 成功项用落盘路径，失败项退回原文件（不让用户的选择因单个文件失败而丢失）。
- * 非 Electron / 无 attachments 桥 / 空 chatId 时原样返回。
+ * 无 attachments 桥 / 空 chatId 时原样返回。
  */
 export async function saveChatAttachments(
   chatId: string | null | undefined,
   files: AttachmentFile[],
 ): Promise<AttachmentFile[]> {
   if (!chatId || files.length === 0) return files;
-  if (!isElectron()) return files;
   const bridge = getElectronBridge();
   if (!bridge?.attachments?.save) return files;
   try {

package/src/pages/AgentPage.tsx

@@ -61,6 +61,10 @@ import {
   setPendingFirstMessage,
   takePendingFirstMessage,
 } from "@/lib/pending-first-message";
+import {
+  composeAttachmentUserContent,
+  saveChatAttachments,
+} from "@/lib/attachments";
 import { BRAND_NAME, pickDefaultAgentId } from "@/brand";
 
 /**
@@ -1299,29 +1303,12 @@ function EmptyChatGate() {
       length: trimmed.length,
     });
 
-    // 与 LocalChatPanel.handleSubmit 相同的装配规则：文件路径附到正文，
-    // @ 引用进 metadata，plan 模式打 metadata.mode。
-    if (files.length > 0) {
-      const fileRefs = files.map((f) => `- \`${f.path}\``).join("\n");
-      trimmed = trimmed
-        ? `${trimmed}\n\n---\n关联文件:\n${fileRefs}`
-        : `关联文件:\n${fileRefs}`;
-    }
     const mentionedAgentIds = mentionReferences
       .filter((ref) => ref.type === "agent")
       .map((ref) => ref.id);
     const referencedChatIds = mentionReferences
       .filter((ref) => ref.type === "chat")
       .map((ref) => ref.id);
-    const metadata = {
-      ...(mode === "plan" ? { mode: "plan" as const } : {}),
-      ...(execPolicy === "full" ? { execPolicy: "full" as const } : {}),
-      ...(ctx.selectedAgentId ? { agentId: ctx.selectedAgentId } : {}),
-      ...(mentionedAgentIds.length > 0 ? { mentionedAgentIds } : {}),
-      ...(referencedChatIds.length > 0 ? { referencedChatIds } : {}),
-      ...(modelOverride ? { model: modelOverride } : {}),
-      ...(effortOverride ? { reasoningEffort: effortOverride } : {}),
-    };
 
     setIsCreating(true);
     setCreateError(null);
@@ -1331,9 +1318,23 @@ function EmptyChatGate() {
         ...(ctx.selectedAgentId ? { agentId: ctx.selectedAgentId } : {}),
       });
       if (!id) throw new Error("创建对话失败，请重试");
+      // 落地页提交时还没有 chatId；先建会话再落盘，正文用落盘路径。
+      const resolvedFiles =
+        files.length > 0 ? await saveChatAttachments(id, files) : files;
+      const assembled = composeAttachmentUserContent(trimmed, resolvedFiles);
+      const metadata = {
+        ...(mode === "plan" ? { mode: "plan" as const } : {}),
+        ...(execPolicy === "full" ? { execPolicy: "full" as const } : {}),
+        ...(ctx.selectedAgentId ? { agentId: ctx.selectedAgentId } : {}),
+        ...(mentionedAgentIds.length > 0 ? { mentionedAgentIds } : {}),
+        ...(referencedChatIds.length > 0 ? { referencedChatIds } : {}),
+        ...(modelOverride ? { model: modelOverride } : {}),
+        ...(effortOverride ? { reasoningEffort: effortOverride } : {}),
+        ...(assembled.images.length > 0 ? { images: assembled.images } : {}),
+      };
       setPendingFirstMessage({
         chatId: id,
-        content: trimmed,
+        content: assembled.content,
         metadata: Object.keys(metadata).length > 0 ? metadata : undefined,
       });
       navigate(`/agent/${id}`);