@co0ontty/wand 4.72.2-beta.gcc5d57e → 4.73.0

package/dist/server-update-routes.js

@@ -137,6 +137,50 @@ export function registerPublicUpdateRoutes(app, deps) {
             readErrorMessage: "读取 APK 文件失败。",
         });
     }));
+    // 原生 macOS Beta 只使用当前连接服务端的本地分发文件；旧 DMG 接口保持兼容。
+    app.get("/api/macos-app-update", asyncRoute(async (req, res) => {
+        const currentVersion = requireCurrentVersion(req, res);
+        if (currentVersion === null)
+            return;
+        const latest = await deps.resolveLatestMacosBeta();
+        if (!latest) {
+            res.json({ updateAvailable: false, currentVersion, latestVersion: null, downloadUrl: null, source: null, channel: "beta" });
+            return;
+        }
+        const updateAvailable = compareWandInstallOrder(latest.version, currentVersion) > 0;
+        res.json({
+            updateAvailable,
+            currentVersion,
+            latestVersion: latest.version,
+            downloadUrl: updateAvailable ? latest.downloadUrl : null,
+            fileName: updateAvailable ? latest.fileName : null,
+            size: updateAvailable ? latest.size : null,
+            source: "local",
+            channel: "beta",
+            sha256: updateAvailable ? latest.sha256 : null,
+        });
+    }));
+    app.get("/macos/update-download", asyncRoute(async (req, res) => {
+        const fileName = text(req.query.fileName);
+        const asset = await deps.resolveMacosBetaDownload(fileName);
+        if (!asset) {
+            res.status(404).json({ error: "当前没有可下载的 macOS Beta 更新包。" });
+            return;
+        }
+        const sha256 = await deps.computeAssetSha256(asset);
+        if (!sha256) {
+            res.status(503).json({ error: "无法校验 macOS Beta 更新包。" });
+            return;
+        }
+        streamFileWithRange(req, res, {
+            filePath: asset.filePath,
+            size: asset.size,
+            contentType: asset.fileName.toLowerCase().endsWith(".zip") ? "application/zip" : "application/x-apple-diskimage",
+            disposition: `attachment; filename="${encodeURIComponent(asset.fileName)}"`,
+            headers: { "X-MacOS-Sha256": sha256 },
+            readErrorMessage: "读取 macOS Beta 更新包失败。",
+        });
+    }));
     app.get("/api/macos-dmg-update", asyncRoute(async (req, res) => {
         const currentVersion = requireCurrentVersion(req, res);
         if (currentVersion === null)

package/dist/server.js

@@ -55,7 +55,9 @@ import { isLogBusActive, wandTuiLog } from "./tui/log-bus.js";
 import { EMBEDDED_WEB_ASSETS } from "./web-ui/embedded-assets.js";
 import { renderApp } from "./web-ui/index.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
-import { createTerminalHost, TerminalDaemonClient } from "./terminal-daemon-client.js";
+import { TerminalDaemonClient } from "./terminal-daemon-client.js";
+import { createUpgradeAwareTerminalHost } from "./render-host.js";
+import { createUpgradeAwareStructuredHost } from "./render-structured-host.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { updateProviderClis, verifyProviderCliUpdateResults, } from "./provider-cli-updater.js";
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
@@ -317,13 +319,27 @@ export async function startServer(config, configPath, options = {}) {
         config,
         repositoryUrl: PKG_REPO_URL,
     });
-    const terminalHost = options.terminalHost ?? await createTerminalHost(configPath);
+    const knownPtySessionIds = storage.loadSessions()
+        .filter((session) => (session.sessionKind ?? "pty") === "pty" && session.status === "running")
+        .map((session) => session.id);
+    // PTY 所有者可以是 legacy terminald 或常驻的 Rust Render：升级期由复合 host 按所有权
+    // 路由（旧会话留在 legacy，新会话进 Render），对客户端契约没有任何改变。
+    const ptyHosts = options.terminalHost
+        ? { host: options.terminalHost, renderHost: null, legacyHost: null }
+        : await createUpgradeAwareTerminalHost(configPath, {
+            engine: config.render?.engine,
+            binaryPath: config.render?.binaryPath,
+            knownSessionIds: knownPtySessionIds,
+        });
+    const terminalHost = ptyHosts.host;
     const processes = new ProcessManager(config, storage, configDir, terminalHost);
     const structuredLogger = new SessionLogger(configDir, config.shortcutLogMaxBytes);
-    // Production startup requires the daemon-backed host so CLI runs outlive web
-    // restarts. In-process hosts are retained only for explicit test injection.
-    const structuredExecHost = terminalHost instanceof TerminalDaemonClient ? terminalHost : undefined;
-    const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredExecHost);
+    // Production startup provides a daemon-backed host for structured CLI runs
+    // even when Render owns every PTY. In-process hosts are for test injection.
+    const legacyStructuredHost = ptyHosts.legacyHost
+        ?? (terminalHost instanceof TerminalDaemonClient ? terminalHost : null);
+    const structuredHosts = await createUpgradeAwareStructuredHost(configPath, legacyStructuredHost, config.structured?.processHost);
+    const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredHosts.host);
     const sessionRegistry = new SessionRegistry(processes, structuredSessions, storage);
     const missions = new Missions(storage, structuredSessions, sessionRegistry);
     const updateState = new ServerUpdateState();
@@ -809,9 +825,7 @@ export async function startServer(config, configPath, options = {}) {
     wsManager.setup({
         getSession: (id) => sessionRegistry.get(id),
         getTerminalState: (id) => processes.getTerminalState(id),
-        sendPtyInput: (id, input, shortcutKey, userInput) => {
-            processes.sendInput(id, input, "terminal", shortcutKey, userInput);
-        },
+        sendPtyInput: (id, input, shortcutKey, userInput) => processes.sendInputConfirmed(id, input, "terminal", shortcutKey, userInput).then(() => { }),
         resizePty: (id, cols, rows) => {
             processes.resize(id, cols, rows);
         },
@@ -886,6 +900,10 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* noop */ }
+            try {
+                structuredHosts.rustClient?.disconnect();
+            }
+            catch { /* noop */ }
             try {
                 structuredLogger.dispose();
             }
@@ -1151,6 +1169,10 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* best-effort shutdown */ }
+            try {
+                structuredHosts.rustClient?.disconnect();
+            }
+            catch { /* best-effort shutdown */ }
             try {
                 structuredLogger.dispose();
             }

package/dist/session-transport.js

@@ -87,7 +87,7 @@ export function toSessionDetailDTO(snapshot, options = {}) {
         outputOffset,
         outputTotal: rawOutput.length,
         outputTruncated: outputOffset > 0,
-        ...(options.messages !== undefined ? { messages: enrichStructuredMessages(options.messages) } : {}),
+        ...(options.messages !== undefined ? { messages: enrichStructuredMessages(options.messages, snapshot.id) } : {}),
         ...(options.messageOffset !== undefined ? { messageOffset: options.messageOffset } : {}),
         ...(options.messageTotal !== undefined ? { messageTotal: options.messageTotal } : {}),
         ...(options.leadingBlockOffset !== undefined ? { leadingBlockOffset: options.leadingBlockOffset } : {}),

package/dist/storage.d.ts

@@ -125,6 +125,7 @@ export declare class WandStorage {
     createWandTask(input: {
         workspaceId?: string | null;
         workspaceTaskId?: string | null;
+        parentTaskId?: string | null;
         title: string;
         titleSource?: import("./task-types.js").WandTaskTitleSource;
         description?: string;
@@ -135,7 +136,7 @@ export declare class WandStorage {
         milestoneId?: string | null;
         agent?: import("./task-types.js").WandTaskAgent | null;
     }): import("./task-types.js").WandTask;
-    updateWandTask(id: string, patch: Partial<Pick<import("./task-types.js").WandTask, "workspaceId" | "workspaceTaskId" | "title" | "titleSource" | "autoTitleSignature" | "description" | "status" | "priority" | "labels" | "dueDate" | "milestoneId" | "sortOrder" | "agent">>): import("./task-types.js").WandTask | null;
+    updateWandTask(id: string, patch: Partial<Pick<import("./task-types.js").WandTask, "workspaceId" | "workspaceTaskId" | "parentTaskId" | "title" | "titleSource" | "autoTitleSignature" | "description" | "status" | "priority" | "labels" | "dueDate" | "milestoneId" | "sortOrder" | "agent">>): import("./task-types.js").WandTask | null;
     deleteWandTask(id: string): void;
     /**
      * 里程碑列表。传工作区 id 时返回「该工作区 + 全局（workspace_id IS NULL）」；

package/dist/storage.js

@@ -755,6 +755,7 @@ const INIT_SQL = `
     sort_order INTEGER NOT NULL DEFAULT 0,
     agent_json TEXT,
     workspace_task_id TEXT,
+    parent_task_id TEXT,
     title_source TEXT,
     auto_title_signature TEXT,
     created_at TEXT NOT NULL,
@@ -784,6 +785,9 @@ function ensureWandTaskSchema(db) {
         db.exec("ALTER TABLE wand_tasks ADD COLUMN agent_json TEXT");
     if (columns.length > 0 && !names.has("workspace_task_id"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN workspace_task_id TEXT");
+    // 父任务归属只加列；历史任务仍然是顶层任务。
+    if (columns.length > 0 && !names.has("parent_task_id"))
+        db.exec("ALTER TABLE wand_tasks ADD COLUMN parent_task_id TEXT");
     // 标题来源：'user' = 用户手写，'auto' = 由描述/会话内容自动生成。只加列，历史行保持 NULL（读取时视为 user）。
     if (columns.length > 0 && !names.has("title_source"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN title_source TEXT");
@@ -798,6 +802,7 @@ function ensureWandTaskSchema(db) {
         // INIT_SQL cannot create it: CREATE TABLE IF NOT EXISTS is a no-op on old
         // wand_tasks, and CREATE INDEX would then fail with "no such column".
         db.exec("CREATE INDEX IF NOT EXISTS idx_wand_tasks_workspace_task ON wand_tasks(workspace_task_id)");
+        db.exec("CREATE INDEX IF NOT EXISTS idx_wand_tasks_parent ON wand_tasks(parent_task_id)");
         const rows = db.prepare("SELECT id FROM wand_tasks WHERE identifier IS NULL OR identifier = '' ORDER BY created_at, id").all();
         const update = db.prepare("UPDATE wand_tasks SET identifier = ? WHERE id = ?");
         rows.forEach((row, index) => update.run(`TASK-${index + 1}`, row.id));
@@ -1296,7 +1301,7 @@ export class WandStorage {
     }
     /** GET /api/wand-tasks 的顺序：新创建在前。客户端按此顺序渲染，不再本地排序。 */
     listWandTasks(workspaceId) {
-        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
+        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks ${workspaceId === undefined ? "" : "WHERE workspace_id IS ?"}
        ORDER BY created_at DESC, rowid DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
         return rows.map((row) => this.mapWandTaskRow(row));
@@ -1307,6 +1312,7 @@ export class WandStorage {
             identifier: typeof row.identifier === "string" && row.identifier ? row.identifier : `TASK-${String(row.id).slice(0, 6)}`,
             workspaceId: typeof row.workspace_id === "string" ? row.workspace_id : null,
             workspaceTaskId: typeof row.workspace_task_id === "string" && row.workspace_task_id ? row.workspace_task_id : null,
+            parentTaskId: typeof row.parent_task_id === "string" && row.parent_task_id ? row.parent_task_id : null,
             title: String(row.title),
             titleSource: row.title_source === "auto" ? "auto" : "user",
             autoTitleSignature: typeof row.auto_title_signature === "string" && row.auto_title_signature ? row.auto_title_signature : null,
@@ -1326,7 +1332,7 @@ export class WandStorage {
         return this.listWandTasks().find((task) => task.id === id) ?? null;
     }
     getWandTaskByWorkspaceTaskId(workspaceTaskId) {
-        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
+        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks WHERE workspace_task_id = ? ORDER BY updated_at DESC LIMIT 1`).get(workspaceTaskId);
         return row ? this.mapWandTaskRow(row) : null;
     }
@@ -1338,7 +1344,7 @@ export class WandStorage {
         const max = this.db.prepare("SELECT COALESCE(MAX(sort_order), -1) AS value FROM wand_tasks WHERE workspace_id IS ? AND status = ?").get(input.workspaceId ?? null, status);
         const numberRow = this.db.prepare("SELECT COALESCE(MAX(CAST(substr(identifier, 6) AS INTEGER)), 0) AS value FROM wand_tasks WHERE identifier GLOB 'TASK-[0-9]*'").get();
         const identifier = `TASK-${(numberRow?.value ?? 0) + 1}`;
-        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
+        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.parentTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
         return this.getWandTask(id);
     }
     updateWandTask(id, patch) {
@@ -1346,7 +1352,7 @@ export class WandStorage {
         if (!current)
             return null;
         const next = { ...current, ...patch, updatedAt: nowIso() };
-        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
+        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, parent_task_id = ?, title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.parentTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
         if (next.workspaceTaskId) {
             const workspaceId = next.workspaceId ?? this.ensureGlobalWorkspace().id;
             this.db.prepare(`UPDATE workspace_tasks SET name = ?, status = ?, milestone_id = ?, workspace_id = ? WHERE id = ?`)
@@ -1356,7 +1362,10 @@ export class WandStorage {
         }
         return next;
     }
-    deleteWandTask(id) { this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id); }
+    deleteWandTask(id) {
+        this.db.prepare("UPDATE wand_tasks SET parent_task_id = NULL WHERE parent_task_id = ?").run(id);
+        this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id);
+    }
     // ── 里程碑（迭代，归属工作区；任务只存 milestoneId）──
     /**
      * 里程碑列表。传工作区 id 时返回「该工作区 + 全局（workspace_id IS NULL）」；

package/dist/structured-client-protocol.d.ts

@@ -3,5 +3,7 @@ export declare const WAND_PROTOCOL_VERSION = 2;
 /**
  * Add Wand-owned semantics without mutating persisted provider blocks.
  * This is the external interface consumed by every client.
+ *
+ * 传 sessionId 时额外把内联图片改写成取图 URL（见 rewriteInlineToolImageUrls）。
  */
-export declare function enrichStructuredMessages(messages: ConversationTurn[]): ConversationTurn[];
+export declare function enrichStructuredMessages(messages: ConversationTurn[], sessionId?: string): ConversationTurn[];

package/dist/structured-client-protocol.js

@@ -1,4 +1,4 @@
-import { asRecord } from "./structured-content.js";
+import { asRecord, isStructuredImagePart } from "./structured-content.js";
 export const WAND_PROTOCOL_VERSION = 2;
 function text(value) {
     return typeof value === "string" && value ? value : undefined;
@@ -46,6 +46,8 @@ function questionsFromInput(input) {
 /** 派发子 Agent 的工具名：Claude Code 的 Task/Agent，以及 Wand pi 扩展的 subagent。 */
 const SUBAGENT_TOOL_NAMES = new Set(["Task", "Agent"]);
 const PI_SUBAGENT_TOOL_NAME = "Pi/subagent";
+/** pi 的待办扩展工具，经 `piToolName` 映射后带 `Pi/` 前缀。 */
+const PI_TODO_TOOL_NAME = "Pi/todo";
 /**
  * 历史 turn / 非 Claude provider 的子 Agent 工具调用没有 `__subagent` 盖章，
  * 按调用参数现场补一份，让「子 Agent」面板在所有端都拿得到同一份分组。
@@ -121,6 +123,10 @@ function toolResultText(block) {
         return block.content;
     return block.content.map((part) => text(part.text) ?? "").join("");
 }
+const TASK_LIST_TOOL_NAMES = ["TodoWrite", "TaskCreate", "TaskUpdate", "TaskList", PI_TODO_TOOL_NAME];
+function piTodoAction(input) {
+    return text(input.action) ?? "";
+}
 function tasksFromSegment(messages, start, end) {
     let latestTodoWrite = null;
     let targetId = null;
@@ -129,7 +135,7 @@ function tasksFromSegment(messages, start, end) {
         for (const block of messages[i]?.content ?? []) {
             if (block.type === "tool_result")
                 resultByToolId.set(block.tool_use_id, toolResultText(block));
-            if (block.type === "tool_use" && ["TodoWrite", "TaskCreate", "TaskUpdate", "TaskList"].includes(block.name)) {
+            if (block.type === "tool_use" && TASK_LIST_TOOL_NAMES.includes(block.name)) {
                 targetId = block.id;
                 if (block.name === "TodoWrite")
                     latestTodoWrite = block;
@@ -158,31 +164,42 @@ function tasksFromSegment(messages, start, end) {
         for (const block of messages[i]?.content ?? []) {
             if (block.type !== "tool_use")
                 continue;
-            if (block.name === "TaskCreate") {
+            // pi 的待办工具把增删改合成一条 call，靠 `action` 区分，且主键是 `id` 而非 `taskId`。
+            const piAction = block.name === PI_TODO_TOOL_NAME ? piTodoAction(block.input) : null;
+            const isCreate = block.name === "TaskCreate" || piAction === "create";
+            const isUpdate = block.name === "TaskUpdate"
+                || (piAction !== null && piAction !== "list" && piAction !== "get");
+            if (!isCreate && !isUpdate)
+                continue;
+            if (piAction === "clear") {
                 sawTaskTool = true;
+                tasks.clear();
+                continue;
+            }
+            const rawId = isCreate ? "" : String(block.input.taskId ?? block.input.id ?? "");
+            if (!isCreate && !rawId)
+                continue;
+            sawTaskTool = true;
+            let id;
+            if (isCreate) {
                 fallbackId++;
-                const match = resultByToolId.get(block.id)?.match(/#([^\s]+)/);
-                const id = match?.[1] ?? String(fallbackId);
-                tasks.set(id, {
-                    id,
-                    content: text(block.input.subject) ?? text(block.input.description) ?? `Task #${id}`,
-                    status: "pending",
-                    ...(text(block.input.activeForm) ? { activeForm: text(block.input.activeForm) } : {}),
-                });
+                // 结果文本里才有分配到的 id：Claude「Task #7 created …」/ pi「Created #1: …」。
+                id = resultByToolId.get(block.id)?.match(/#([^\s:,]+)/)?.[1] ?? String(fallbackId);
             }
-            else if (block.name === "TaskUpdate") {
-                sawTaskTool = true;
-                const id = String(block.input.taskId ?? "");
-                if (!id)
-                    continue;
-                const previous = tasks.get(id) ?? { id, content: `Task #${id}`, status: "pending" };
-                tasks.set(id, {
-                    ...previous,
-                    ...(text(block.input.subject) ? { content: text(block.input.subject) } : {}),
-                    ...(text(block.input.status) ? { status: text(block.input.status) } : {}),
-                    ...(text(block.input.activeForm) ? { activeForm: text(block.input.activeForm) } : {}),
-                });
+            else {
+                id = rawId;
             }
+            const content = text(block.input.subject) ?? text(block.input.description);
+            const status = text(block.input.status);
+            const activeForm = text(block.input.activeForm);
+            const deleted = piAction === "delete" || status === "deleted";
+            tasks.set(id, {
+                ...tasks.get(id) ?? { id, content: content ?? `Task #${id}`, status: "pending" },
+                ...(content ? { content } : {}),
+                ...(status ? { status } : {}),
+                ...(deleted ? { status: "deleted" } : {}),
+                ...(activeForm ? { activeForm } : {}),
+            });
         }
     }
     return {
@@ -190,11 +207,54 @@ function tasksFromSegment(messages, start, end) {
         targetId,
     };
 }
+/**
+ * 把 tool_result 里的内联 base64 图片换成「按会话取图」的 URL。
+ *
+ * 为什么不能把 base64 直接下发：读一张截图动辄 1–3MB，base64 后更大，会撑爆移动端
+ * 单帧上限（iOS 默认 1MiB）导致反复断连；而且同一张图在每条快照里重复传。换成 URL
+ * 后各端用同一套带鉴权的取图通道按需加载（Web 走 <img>，原生走各自 ImageLoader）。
+ * source 本来就是 url 的图片不动，保持幂等。
+ */
+function rewriteInlineToolImageUrls(messages, sessionId) {
+    return messages.map((turn) => {
+        let turnChanged = false;
+        const content = turn.content.map((block) => {
+            if (block.type !== "tool_result" || !Array.isArray(block.content))
+                return block;
+            let imageIndex = -1;
+            let blockChanged = false;
+            const parts = block.content.map((part) => {
+                if (!isStructuredImagePart(part))
+                    return part;
+                imageIndex += 1;
+                const source = asRecord(part.source);
+                if (source?.type !== "base64" || typeof source.data !== "string")
+                    return part;
+                blockChanged = true;
+                return {
+                    type: "image",
+                    source: {
+                        type: "url",
+                        url: `/api/sessions/${encodeURIComponent(sessionId)}/tool-images/${encodeURIComponent(block.tool_use_id)}/${imageIndex}`,
+                        ...(typeof source.media_type === "string" ? { media_type: source.media_type } : {}),
+                    },
+                };
+            });
+            if (!blockChanged)
+                return block;
+            turnChanged = true;
+            return { ...block, content: parts };
+        });
+        return turnChanged ? { ...turn, content } : turn;
+    });
+}
 /**
  * Add Wand-owned semantics without mutating persisted provider blocks.
  * This is the external interface consumed by every client.
+ *
+ * 传 sessionId 时额外把内联图片改写成取图 URL（见 rewriteInlineToolImageUrls）。
  */
-export function enrichStructuredMessages(messages) {
+export function enrichStructuredMessages(messages, sessionId) {
     const enriched = stampDerivedSubagents(messages).map((turn) => ({
         ...turn,
         content: turn.content.map((block) => {
@@ -231,5 +291,5 @@ export function enrichStructuredMessages(messages) {
         }
         segmentStart = i;
     }
-    return enriched;
+    return sessionId ? rewriteInlineToolImageUrls(enriched, sessionId) : enriched;
 }

package/dist/structured-content.d.ts

@@ -1,7 +1,24 @@
 /** 把 unknown 收敛成普通对象；数组 / null / 原始值都返回 null。 */
 export declare function asRecord(value: unknown): Record<string, unknown> | null;
-/** Preserve both Responses content parts and arbitrary structured tool output. */
-export declare function normalizeStructuredToolResultContent(content: unknown): string | Array<{
+export type StructuredContentPart = {
     type: string;
     [key: string]: unknown;
-}>;
+};
+/**
+ * 各家 provider 的图片 part 形态不同：
+ *   · Anthropic：`{ type:"image", source:{ type:"base64", media_type, data } }` / `source:{ type:"url", url }`
+ *   · OpenAI Responses：`{ type:"image_url", image_url:{ url } }` / `image_url:"…"`
+ *   · Pi：`{ type:"image", data, mimeType }`
+ * 只要带图片语义就算，具体归一化交给 canonicalizeStructuredImagePart。
+ */
+export declare function isStructuredImagePart(value: unknown): boolean;
+/**
+ * 统一成客户端认识的规范形态（Web / Android / iOS / macOS 都按
+ * `{ type:"image", source:{ type:"base64"|"url", … } }` 解析）。识别不了返回 null，
+ * 由调用方原样保留，避免丢信息。
+ */
+export declare function canonicalizeStructuredImagePart(value: unknown): StructuredContentPart | null;
+/** content（字符串 / part 数组）里是否含图片 part。 */
+export declare function contentHasStructuredImage(content: unknown): boolean;
+/** Preserve both Responses content parts and arbitrary structured tool output. */
+export declare function normalizeStructuredToolResultContent(content: unknown): string | StructuredContentPart[];

package/dist/structured-content.js

@@ -4,12 +4,91 @@ export function asRecord(value) {
         ? value
         : null;
 }
+function stringValue(value) {
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+/**
+ * 各家 provider 的图片 part 形态不同：
+ *   · Anthropic：`{ type:"image", source:{ type:"base64", media_type, data } }` / `source:{ type:"url", url }`
+ *   · OpenAI Responses：`{ type:"image_url", image_url:{ url } }` / `image_url:"…"`
+ *   · Pi：`{ type:"image", data, mimeType }`
+ * 只要带图片语义就算，具体归一化交给 canonicalizeStructuredImagePart。
+ */
+export function isStructuredImagePart(value) {
+    const part = asRecord(value);
+    if (!part)
+        return false;
+    if (part.type === "image_url")
+        return !!imageUrlOf(part);
+    if (part.type !== "image")
+        return false;
+    const source = asRecord(part.source);
+    if (source && (stringValue(source.data) || stringValue(source.url)))
+        return true;
+    return !!(stringValue(part.data) || stringValue(part.url));
+}
+function imageUrlOf(part) {
+    const raw = part.image_url;
+    if (typeof raw === "string")
+        return stringValue(raw);
+    return stringValue(asRecord(raw)?.url);
+}
+/**
+ * 统一成客户端认识的规范形态（Web / Android / iOS / macOS 都按
+ * `{ type:"image", source:{ type:"base64"|"url", … } }` 解析）。识别不了返回 null，
+ * 由调用方原样保留，避免丢信息。
+ */
+export function canonicalizeStructuredImagePart(value) {
+    const part = asRecord(value);
+    if (!part)
+        return null;
+    if (part.type === "image_url") {
+        const url = imageUrlOf(part);
+        return url ? { type: "image", source: { type: "url", url } } : null;
+    }
+    if (part.type !== "image")
+        return null;
+    const source = asRecord(part.source);
+    if (source) {
+        const data = stringValue(source.data);
+        if (source.type === "base64" && data) {
+            return {
+                type: "image",
+                source: { type: "base64", media_type: stringValue(source.media_type) ?? "image/png", data },
+            };
+        }
+        const url = stringValue(source.url);
+        if (url)
+            return { type: "image", source: { type: "url", url } };
+    }
+    const data = stringValue(part.data);
+    if (data) {
+        const mediaType = stringValue(part.mimeType)
+            ?? stringValue(part.mime_type)
+            ?? stringValue(source?.media_type)
+            ?? "image/png";
+        return { type: "image", source: { type: "base64", media_type: mediaType, data } };
+    }
+    const url = stringValue(part.url);
+    if (url)
+        return { type: "image", source: { type: "url", url } };
+    return null;
+}
+/** content（字符串 / part 数组）里是否含图片 part。 */
+export function contentHasStructuredImage(content) {
+    if (!Array.isArray(content))
+        return false;
+    return content.some((part) => isStructuredImagePart(part));
+}
 /** Preserve both Responses content parts and arbitrary structured tool output. */
 export function normalizeStructuredToolResultContent(content) {
     if (typeof content === "string")
         return content;
     if (Array.isArray(content)) {
-        const parts = content.filter((item) => !!item && typeof item === "object" && typeof item.type === "string");
+        const parts = content
+            .filter((item) => !!item && typeof item === "object" && typeof item.type === "string")
+            // 图片 part 归一化后客户端才能跨端渲染；非图片 part 原样保留。
+            .map((part) => canonicalizeStructuredImagePart(part) ?? part);
         if (parts.length === content.length)
             return parts;
         try {

package/dist/structured-exec-host.js

@@ -79,6 +79,12 @@ class InProcessStructuredExecProcess {
             });
         });
         this.child.on("error", () => settleExit({ exitCode: null, signal: null }));
+        this.child.stdin?.on("error", () => {
+            // EPIPE is emitted by stdin, not by ChildProcess. Never claim success
+            // when a child exits before consuming its one-shot prompt.
+            settleExit({ exitCode: -1, signal: null });
+            this.interrupt();
+        });
     }
     get pid() {
         return this.child.pid ?? -1;
@@ -118,9 +124,9 @@ export class InProcessStructuredExecHost {
             env: request.env,
             stdio: wantsStdin ? ["pipe", "pipe", "pipe"] : ["ignore", "pipe", "pipe"],
         });
+        const wrapped = new InProcessStructuredExecProcess(request.runId, child);
         if (wantsStdin)
             child.stdin?.end(request.stdinData);
-        const wrapped = new InProcessStructuredExecProcess(request.runId, child);
         // Keep exited records until forgetRun so a late attach can still answer.
         this.processes.set(request.runId, wrapped);
         return wrapped;

package/dist/structured-exec-pump.js

@@ -80,19 +80,23 @@ export function startStructuredCli(options) {
             env: options.env,
             stdio: wantsStdin ? ["pipe", "pipe", "pipe"] : ["ignore", "pipe", "pipe"],
         });
-        if (wantsStdin)
-            child.stdin?.end(options.stdinData);
         source = { pid: child.pid ?? null, interrupt: () => child.kill("SIGTERM") };
         const stdoutDecoder = createUtf8TextDecoder();
         const stderrDecoder = createUtf8TextDecoder();
         child.stdout?.on("data", (chunk) => handleStdoutText(stdoutDecoder.write(chunk)));
         child.stderr?.on("data", (chunk) => handleStderrText(stderrDecoder.write(chunk)));
         child.on("error", (error) => finish(null, null, error));
+        child.stdin?.on("error", (error) => {
+            finish(null, null, error);
+            child.kill("SIGTERM");
+        });
         child.on("close", (exitCode, signalName) => {
             handleStdoutText(stdoutDecoder.end());
             handleStderrText(stderrDecoder.end());
             finish(exitCode, signalName === null || signalName === undefined ? null : signalName);
         });
+        if (wantsStdin)
+            child.stdin?.end(options.stdinData);
         sourceReady = Promise.resolve();
     }
     return {

package/dist/structured-pi-adapter.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { startStructuredCli } from "./structured-exec-pump.js";
-import { asRecord } from "./structured-content.js";
+import { asRecord, normalizeStructuredToolResultContent } from "./structured-content.js";
 import { thinkingEffortToPiLevel } from "./structured-provider-common.js";
 export function isMissingPiSession(error, sessionId) {
     return !!sessionId && !!error?.includes(`No session found matching '${sessionId}'`);
@@ -17,6 +17,22 @@ function textContent(value) {
         return item.text;
     return textContent(item.content);
 }
+/**
+ * Pi 的工具结果是 `{ content: [ text…, image… ] }`。图片 part 不能像以前那样只抽文本
+ * 丢掉——读图 / 截图全靠它，统一交给 normalizeStructuredToolResultContent 归一化。
+ * 纯文本结果仍压成字符串，保持既有形态。
+ */
+function piToolResultContent(value) {
+    const record = asRecord(value);
+    const raw = record && "content" in record ? record.content : value;
+    const normalized = normalizeStructuredToolResultContent(raw);
+    if (typeof normalized === "string")
+        return normalized;
+    if (normalized.length > 0 && normalized.every((part) => part.type === "text" && typeof part.text === "string")) {
+        return normalized.map((part) => part.text).filter(Boolean).join("\n");
+    }
+    return normalized;
+}
 export function buildPiArgs(session, prompt) {
     const args = ["--mode", "json", "--print"];
     const model = session.selectedModel?.trim();
@@ -141,7 +157,7 @@ export function applyPiEvent(state, event) {
     }
     if (event.type === "tool_execution_end") {
         const id = typeof event.toolCallId === "string" ? event.toolCallId : "unknown";
-        state.blocks.push({ type: "tool_result", tool_use_id: id, content: textContent(event.result), is_error: event.isError === true });
+        state.blocks.push({ type: "tool_result", tool_use_id: id, content: piToolResultContent(event.result), is_error: event.isError === true });
     }
     if (event.type === "message_end" || event.type === "turn_end") {
         const message = asRecord(event.message);

package/dist/structured-session-manager.d.ts

@@ -155,6 +155,8 @@ export declare class StructuredSessionManager {
      * 本身，flushNext 在另一段时序里读 sessions.get(...) 当前快照，已经天然安全。
      */
     reorderQueuedMessages(sessionId: string, order: number[]): SessionSnapshot;
+    /** Edit only the pending item still identified by both index and original text. */
+    editQueuedMessage(sessionId: string, index: number, expectedText: string, text: string): SessionSnapshot;
     /** Remove a single queued message only while index and text still identify the same item. */
     deleteQueuedMessage(sessionId: string, index: number, expectedText?: string): SessionSnapshot;
     /**