@co0ontty/wand 4.80.1 → 4.81.0

package/dist/server-session-routes.js

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { PtyInputDeliveryError, SessionInputError } from "./process-manager.js";
 import { getDefaultModelForProvider, isExecutionMode } from "./config.js";
-import { alignedBlockStart, blockWindowMessagesForTransport, sliceTurnBlocksForTransport, truncateMessagesForTransport, visibleBlockCount, windowMessagesForTransport } from "./message-truncator.js";
+import { alignedBlockStart, blockWindowMessagesForTransport, compactToolMessagesForTransport, sliceTurnBlocksForTransport, truncateMessagesForTransport, visibleBlockCount, windowMessagesForTransport } from "./message-truncator.js";
 import { toSessionDetailDTO, toSessionListItemDTO } from "./session-transport.js";
 import { checkSessionWorktreeMergeabilityAsync, cleanupSessionWorktreeAsync, getWorktreeMergeErrorCode, mergeSessionWorktreeAsync, WorktreeMergeError, } from "./git-worktree.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -347,8 +347,10 @@ function isMergeActionAllowed(snapshot) {
     return snapshot.status !== "running";
 }
 export function registerSessionRoutes(app, processes, structured, storage, defaultMode, config, sessions, onSessionCreated) {
-    const sessionResponseDTO = (snapshot) => {
-        const windowed = windowMessagesForTransport(enrichStructuredMessages(snapshot.messages ?? [], snapshot.id), config.cardDefaults ?? {});
+    const wantsCompactTools = (req) => req.get("X-Wand-Tool-Projection") === "compact" || req.query.compactTools === "1";
+    const sessionResponseDTO = (snapshot, req) => {
+        const enriched = enrichStructuredMessages(snapshot.messages ?? [], snapshot.id);
+        const windowed = windowMessagesForTransport(wantsCompactTools(req) ? compactToolMessagesForTransport(enriched) : enriched, config.cardDefaults ?? {});
         return toSessionDetailDTO(snapshot, {
             messages: windowed.messages,
             messageOffset: windowed.messageOffset,
@@ -507,14 +509,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     const accepted = structured.get(snapshot.id);
                     if (!accepted)
                         throw new Error("未找到该结构化会话。");
-                    res.status(201).json(sessionResponseDTO(accepted));
+                    res.status(201).json(sessionResponseDTO(accepted, req));
                     return;
                 }
                 const finished = await structured.sendMessage(snapshot.id, prompt);
-                res.status(201).json(sessionResponseDTO(finished));
+                res.status(201).json(sessionResponseDTO(finished, req));
                 return;
             }
-            res.status(201).json(sessionResponseDTO(snapshot));
+            res.status(201).json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法启动结构化会话。");
@@ -530,7 +532,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(404).json({ error: "未找到该会话。" });
                 return;
             }
-            res.json(updated);
+            res.json(wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated);
         }
         catch (error) {
             sendRouteError(res, error, "切换模型失败。");
@@ -548,7 +550,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(404).json({ error: "未找到该会话。" });
                 return;
             }
-            res.json(updated);
+            res.json(wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated);
         }
         catch (error) {
             sendRouteError(res, error, "切换思考深度失败。");
@@ -577,7 +579,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             const effective = (snapshot.provider ?? "claude") === "codex" ? "full-access" : mode;
-            res.json(sessions.setSessionMode(id, effective));
+            const updated = sessions.setSessionMode(id, effective);
+            res.json(updated && wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated);
         }
         catch (error) {
             sendRouteError(res, error, "切换模式失败。");
@@ -589,7 +592,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(404).json({ error: "未找到该结构化会话。" });
             return;
         }
-        const all = snapshot.messages ?? [];
+        const raw = snapshot.messages ?? [];
+        const all = wantsCompactTools(req)
+            ? compactToolMessagesForTransport(enrichStructuredMessages(raw, snapshot.id))
+            : raw;
         const offset = parseBoundedInteger(req.query.offset, Math.max(0, all.length - 40), 0, all.length);
         const limit = parseBoundedInteger(req.query.limit, 40, 1, 200);
         res.json({
@@ -617,7 +623,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 preserveQueue,
                 idempotencyKey,
             });
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             const errorCode = error?.code;
@@ -639,7 +645,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         try {
             const snapshot = structured.reorderQueuedMessages(req.params.id, rawOrder.map((v) => Number(v)));
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法调整排队顺序。");
@@ -652,7 +658,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             return;
         }
         try {
-            res.json(sessionResponseDTO(structured.editQueuedMessage(req.params.id, Number(req.params.index), expectedText, text)));
+            res.json(sessionResponseDTO(structured.editQueuedMessage(req.params.id, Number(req.params.index), expectedText, text), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法编辑排队消息。");
@@ -667,7 +673,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const expectedText = typeof req.body?.expectedText === "string" ? req.body.expectedText : undefined;
         try {
             const snapshot = structured.deleteQueuedMessage(req.params.id, index, expectedText);
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法删除排队消息。");
@@ -683,7 +689,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
         try {
             const snapshot = await structured.promoteQueuedMessage(req.params.id, index, expectedText, idempotencyKey);
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             const errorCode = error?.code;
@@ -697,7 +703,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.delete("/api/structured-sessions/:id/queued", (req, res) => {
         try {
             const snapshot = structured.clearQueuedMessages(req.params.id);
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法清空排队消息。");
@@ -712,19 +718,28 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         const toolUseId = req.params.toolUseId;
         const messages = snapshot.messages ?? [];
+        let toolUse;
+        let toolResult;
         for (const turn of messages) {
             for (const block of turn.content) {
-                if (block.type === "tool_result" && block.tool_use_id === toolUseId) {
-                    res.json({
-                        tool_use_id: block.tool_use_id,
-                        content: block.content,
-                        is_error: block.is_error || false,
-                    });
-                    return;
-                }
+                if (block.type === "tool_use" && block.id === toolUseId)
+                    toolUse = block;
+                if (block.type === "tool_result" && block.tool_use_id === toolUseId)
+                    toolResult = block;
             }
         }
-        res.status(404).json({ error: "未找到该工具结果。" });
+        if (!toolUse && !toolResult) {
+            res.status(404).json({ error: "未找到该工具调用。" });
+            return;
+        }
+        res.json({
+            tool_use_id: toolUseId,
+            input: toolUse?.input ?? {},
+            content: toolResult?.content ?? "",
+            is_error: toolResult?.is_error ?? false,
+            pending: !toolResult,
+            resultAvailable: !!toolResult,
+        });
     });
     // ── Inline tool image endpoint ──
     // tool_result 里内联的 base64 图片在传输层被改写为这个 URL（避免把整张图的 base64
@@ -784,7 +799,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 conflict: result.hasConflicts,
                 lastError: result.ok ? undefined : result.reason,
             });
-            res.json({ session: updated, result });
+            res.json({ session: wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated, result });
         }
         catch (error) {
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法检查 worktree 合并状态。"));
@@ -814,7 +829,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 lastError: undefined,
                 conflict: false,
             });
-            res.json({ session: updated, result });
+            res.json({ session: wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated, result });
         }
         catch (error) {
             const current = sessions.getLatest(req.params.id);
@@ -1058,7 +1073,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 lastError: undefined,
                 conflict: false,
             });
-            res.json({ session: updated, ok: true });
+            res.json({ session: wantsCompactTools(req) ? sessionResponseDTO(updated, req) : updated, ok: true });
         }
         catch (error) {
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法清理 worktree。"));
@@ -1117,13 +1132,15 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const transcriptOutput = (snapshot.sessionKind ?? "pty") === "pty"
             ? processes.getPtyTranscript(snapshot.id) ?? snapshot.output
             : snapshot.output;
+        const enriched = enrichStructuredMessages(snapshot.messages ?? [], snapshot.id);
+        const messages = wantsCompactTools(req) ? compactToolMessagesForTransport(enriched) : enriched;
         if (req.query.format === "chat") {
             // 客户端带 blockBudget（Web/iOS）走块级窗口：只回最近 N 个块（必要时切掉最旧 turn 的头部），
             // 根治「单条 turn 上百块/1MB」的长任务打开慢；未启用的客户端保持 turn 级窗口。
             const rawBudget = req.query.blockBudget;
             if (typeof rawBudget === "string" && /^\d+$/.test(rawBudget) && Number(rawBudget) > 0) {
                 const blockBudget = parseBoundedInteger(rawBudget, 1, 1, 2_000);
-                const windowed = blockWindowMessagesForTransport(enrichStructuredMessages(snapshot.messages ?? [], snapshot.id), config.cardDefaults ?? {}, blockBudget);
+                const windowed = blockWindowMessagesForTransport(messages, config.cardDefaults ?? {}, blockBudget);
                 res.json(toSessionDetailDTO(snapshot, {
                     output: transcriptOutput,
                     messages: windowed.messages,
@@ -1136,7 +1153,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             // 与 WS init 对齐：只回最近一窗 turn + offset/total，更早的走 /messages 翻页。
-            const windowed = windowMessagesForTransport(enrichStructuredMessages(snapshot.messages ?? [], snapshot.id), config.cardDefaults ?? {});
+            const windowed = windowMessagesForTransport(messages, config.cardDefaults ?? {});
             res.json(toSessionDetailDTO(snapshot, {
                 output: transcriptOutput,
                 messages: windowed.messages,
@@ -1156,7 +1173,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
         }
-        const all = enrichStructuredMessages(snapshot.messages ?? [], snapshot.id);
+        const enriched = enrichStructuredMessages(snapshot.messages ?? [], snapshot.id);
+        const all = wantsCompactTools(req) ? compactToolMessagesForTransport(enriched) : enriched;
         const total = all.length;
         // Web history: fetch at most one block window *before* the currently
         // displayed turn. A 40-turn page can contain a single multi-MB assistant
@@ -1226,7 +1244,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             const newSnapshot = await startResumedPtySession(processes, storage, existingSession, sessionId, defaultMode, body);
-            res.status(201).json(sessionResponseDTO(newSnapshot));
+            res.status(201).json(sessionResponseDTO(newSnapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法恢复会话。");
@@ -1278,7 +1296,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     workspaceTaskId: existingSession.workspaceTaskId,
                     ...(requestedOrigin ?? {}),
                 });
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot) });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot, req) });
             }
             else {
                 const cwd = body.cwd?.trim();
@@ -1296,7 +1314,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
                     ...(requestedOrigin ?? {}),
                 });
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot) });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot, req) });
             }
         }
         catch (error) {
@@ -1328,11 +1346,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     if (!accepted) {
                         throw new Error("未找到该结构化会话。");
                     }
-                    res.status(202).json(sessionResponseDTO(accepted));
+                    res.status(202).json(sessionResponseDTO(accepted, req));
                     return;
                 }
                 const snapshot = await completion;
-                res.json(sessionResponseDTO(snapshot));
+                res.json(sessionResponseDTO(snapshot, req));
                 return;
             }
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
@@ -1346,7 +1364,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     res.status(202).json({ accepted: true, deliveryConfirmed: false });
                     return;
                 }
-                res.json(sessionResponseDTO(snapshot));
+                res.json(sessionResponseDTO(snapshot, req));
                 return;
             }
             const snapshot = await processes.sendInputConfirmed(sessionId, input, view, shortcutKey);
@@ -1354,7 +1372,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(202).json({ accepted: true });
                 return;
             }
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             const response = getInputErrorResponse(error, sessionId);
@@ -1382,7 +1400,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             const snapshot = processes.resize(req.params.id, body.cols ?? 0, body.rows ?? 0);
-            res.json(sessionResponseDTO(snapshot));
+            res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
             sendRouteError(res, error, "无法调整终端大小。");
@@ -1391,7 +1409,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
         try {
             if (sessions.ownerOf(req.params.id) === "structured") {
-                res.json(sessionResponseDTO(structured.approvePermission(req.params.id)));
+                res.json(sessionResponseDTO(structured.approvePermission(req.params.id), req));
                 return;
             }
             const snapshot = sessions.get(req.params.id);
@@ -1399,7 +1417,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "Codex provider 不支持权限批准操作。" });
                 return;
             }
-            res.json(sessionResponseDTO(processes.approvePermission(req.params.id)));
+            res.json(sessionResponseDTO(processes.approvePermission(req.params.id), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法批准该授权请求。");
@@ -1408,7 +1426,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
         try {
             if (sessions.ownerOf(req.params.id) === "structured") {
-                res.json(sessionResponseDTO(structured.denyPermission(req.params.id)));
+                res.json(sessionResponseDTO(structured.denyPermission(req.params.id), req));
                 return;
             }
             const snapshot = sessions.get(req.params.id);
@@ -1416,7 +1434,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "Codex provider 不支持权限拒绝操作。" });
                 return;
             }
-            res.json(sessionResponseDTO(processes.denyPermission(req.params.id)));
+            res.json(sessionResponseDTO(processes.denyPermission(req.params.id), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法拒绝该授权请求。");
@@ -1425,7 +1443,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
         try {
             if (sessions.ownerOf(req.params.id) === "structured") {
-                res.json(sessionResponseDTO(structured.toggleAutoApprove(req.params.id)));
+                res.json(sessionResponseDTO(structured.toggleAutoApprove(req.params.id), req));
                 return;
             }
             const snapshot = sessions.get(req.params.id);
@@ -1433,7 +1451,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "Codex provider 不支持自动批准切换。" });
                 return;
             }
-            res.json(sessionResponseDTO(processes.toggleAutoApprove(req.params.id)));
+            res.json(sessionResponseDTO(processes.toggleAutoApprove(req.params.id), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法切换自动批准状态。");
@@ -1449,10 +1467,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             if (sessions.ownerOf(req.params.id) === "structured") {
-                res.json(sessionResponseDTO(structured.resolveEscalation(req.params.id, requestId, resolution)));
+                res.json(sessionResponseDTO(structured.resolveEscalation(req.params.id, requestId, resolution), req));
                 return;
             }
-            res.json(sessionResponseDTO(processes.resolveEscalation(req.params.id, requestId, resolution)));
+            res.json(sessionResponseDTO(processes.resolveEscalation(req.params.id, requestId, resolution), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法处理该授权请求。");
@@ -1461,10 +1479,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/stop", (req, res) => {
         try {
             if (sessions.ownerOf(req.params.id) === "structured") {
-                res.json(sessionResponseDTO(structured.stop(req.params.id)));
+                res.json(sessionResponseDTO(structured.stop(req.params.id), req));
                 return;
             }
-            res.json(sessionResponseDTO(processes.stop(req.params.id)));
+            res.json(sessionResponseDTO(processes.stop(req.params.id), req));
         }
         catch (error) {
             sendRouteError(res, error, "无法停止会话。");

package/dist/server.js

@@ -48,6 +48,8 @@ import { RuntimeConfigState } from "./runtime-config.js";
 import { safeServiceInstalled } from "./tui/runtime-utils.js";
 import { checkManagedServiceUpdatePreflight, } from "./update-helper.js";
 import { toSessionDetailDTO } from "./session-transport.js";
+import { compactToolMessagesForTransport, windowMessagesForTransport } from "./message-truncator.js";
+import { enrichStructuredMessages } from "./structured-client-protocol.js";
 import { registerUploadRoutes } from "./upload-routes.js";
 import { optimizePrompt, PromptOptimizeError } from "./prompt-optimizer.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
@@ -837,7 +839,16 @@ export async function startServer(config, configPath, options = {}) {
                     ...origin,
                 }));
             recordRecentPath(storage, snapshot.cwd);
-            res.status(201).json(toSessionDetailDTO(snapshot));
+            const compactTools = req.get("X-Wand-Tool-Projection") === "compact"
+                || req.query.compactTools === "1";
+            if (compactTools) {
+                const messages = compactToolMessagesForTransport(enrichStructuredMessages(snapshot.messages ?? [], snapshot.id));
+                const windowed = windowMessagesForTransport(messages, config.cardDefaults ?? {});
+                res.status(201).json(toSessionDetailDTO(snapshot, windowed));
+            }
+            else {
+                res.status(201).json(toSessionDetailDTO(snapshot));
+            }
         }
         catch (error) {
             sendRouteError(res, error, "无法启动命令。请检查命令是否安装。");

package/dist/structured-session-manager.js

@@ -1,6 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
+import { stampNewToolUseTimes } from "./tool-use-timestamps.js";
 import { buildChildEnv } from "./env-utils.js";
 import { getErrorMessage } from "./error-utils.js";
 import { getDefaultModelForProvider } from "./config.js";
@@ -372,13 +373,15 @@ class TruncatedReplayView {
 function appendNoticeTurn(messages, turn) {
     return [...(messages ?? []), { ...turn, createdAt: isoNow(), completedAt: isoNow() }];
 }
-function upsertAssistantMessage(messages, turn, complete = false) {
+function upsertAssistantMessage(messages, turn, complete = false, stampNewTools = true) {
     const msgs = [...(messages ?? [])];
     const last = msgs[msgs.length - 1];
-    const createdAt = (last?.role === "assistant" ? last.createdAt : undefined) ?? turn.createdAt ?? isoNow();
+    const observedAt = isoNow();
+    const createdAt = (last?.role === "assistant" ? last.createdAt : undefined) ?? turn.createdAt ?? observedAt;
     const next = {
         ...turn,
         createdAt,
+        content: stampNewToolUseTimes(turn.content, last?.role === "assistant" ? last.content : undefined, observedAt, stampNewTools),
     };
     if (complete)
         next.completedAt = isoNow();
@@ -725,6 +728,7 @@ export class StructuredSessionManager {
         // 不能用它覆盖 messages/output，也不能就此冻结前端。
         const replayTruncated = initialState.stdoutTruncated;
         const replayView = new TruncatedReplayView(resumed.messages);
+        let replayingHistory = true;
         const syncTurn = (turnState) => {
             const current = this.currentSessionForRequest(sessionId, requestId);
             if (!current)
@@ -750,7 +754,7 @@ export class StructuredSessionManager {
                 };
                 const patched = {
                     ...current,
-                    messages: upsertAssistantMessage(current.messages, merged),
+                    messages: upsertAssistantMessage(current.messages, merged, false, !replayingHistory),
                     structuredState,
                 };
                 this.sessions.set(sessionId, patched);
@@ -762,7 +766,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const messages = upsertAssistantMessage(current.messages, turn);
+            const messages = upsertAssistantMessage(current.messages, turn, false, !replayingHistory);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -853,6 +857,7 @@ export class StructuredSessionManager {
         }
         // 首轮 feed + attach 完成后再定锚点，之后 onStream 的事件都走合并视图。
         replayView.prime([...processor.state.blocks]);
+        replayingHistory = false;
         runningHandle.onStream((event) => {
             // Events may be buffered while structuredAttach is in flight. Sequence
             // watermarks distinguish overlap with the snapshot from genuinely new
@@ -920,7 +925,7 @@ export class StructuredSessionManager {
         const keepRunning = interruptedForQuestion;
         const messages = replayTruncated
             ? this.mergeTruncatedReplayTurn(current, processor, replayView, !keepRunning)
-            : this.buildCompletedAssistantMessages(current, processor.state);
+            : this.buildCompletedAssistantMessages(current, processor.state, false);
         const finished = {
             ...current,
             status: keepRunning ? "running" : "idle",
@@ -2669,13 +2674,13 @@ export class StructuredSessionManager {
         }
         return compacted;
     }
-    buildCompletedAssistantMessages(current, turnState) {
+    buildCompletedAssistantMessages(current, turnState, stampNewTools = true) {
         const assistantTurn = {
             role: "assistant",
             content: this.compactContentBlocks([...turnState.blocks], turnState.result),
             usage: turnState.usage,
         };
-        return upsertAssistantMessage(current.messages, assistantTurn, true);
+        return upsertAssistantMessage(current.messages, assistantTurn, true, stampNewTools);
     }
     /**
      * Rebuild the trailing assistant turn when the replayed log was truncated.
@@ -2692,7 +2697,7 @@ export class StructuredSessionManager {
             content: this.compactContentBlocks(view.content([...processor.state.blocks]), processor.state.result),
             usage: processor.state.usage,
         };
-        return upsertAssistantMessage([...(current.messages ?? [])], turn, complete);
+        return upsertAssistantMessage([...(current.messages ?? [])], turn, complete, false);
     }
     resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt) {
         if (interruptPrompt && !this.preserveQueueOnInterrupt.has(sessionId))

package/dist/system-employee.d.ts

@@ -27,8 +27,6 @@ export interface SystemEmployeeSeed {
 /** 首次创建内置员工时使用的候选：优先沿用用户已有的系统 AI 工具与模型。 */
 export declare function systemEmployeeSeedAgents(seed?: SystemEmployeeSeed): WandTaskAgent[];
 export declare function systemEmployeeDefinition(agents: WandTaskAgent[], now: string, existing?: SiliconEmployee | null): SiliconEmployee;
-/** 内置员工只保留结构化候选（会话与内部 AI 调用都要求结构化执行）。 */
-export declare function systemEmployeeAgentsOrNull(value: unknown): WandTaskAgent[] | null;
 /**
  * 内部 AI 调用的 CLI 降级链：按用户设置的顺序，模型为空 / "default" 时跟随 provider 默认值。
  */

package/dist/system-employee.js

@@ -56,12 +56,6 @@ export function systemEmployeeDefinition(agents, now, existing) {
         updatedAt: now,
     };
 }
-/** 内置员工只保留结构化候选（会话与内部 AI 调用都要求结构化执行）。 */
-export function systemEmployeeAgentsOrNull(value) {
-    if (!Array.isArray(value) || value.length === 0)
-        return null;
-    return value;
-}
 /**
  * 内部 AI 调用的 CLI 降级链：按用户设置的顺序，模型为空 / "default" 时跟随 provider 默认值。
  */

package/dist/task-types.d.ts

@@ -35,8 +35,6 @@ export declare function normalizeWandTaskAgentMode(provider: WandTaskAgentProvid
  *   - pty：原始 CLI 终端，与「新建工作窗口」里的 PTY 一致。
  */
 export type WandTaskAgentKind = "structured" | "pty";
-/** 合法会话形态清单；顺序即下拉顺序。 */
-export declare const WAND_TASK_AGENT_KINDS: readonly WandTaskAgentKind[];
 /** 历史行 / 老客户端没带 kind 时的兜底：结构化对话，与旧派发行为一致。 */
 export declare const DEFAULT_WAND_TASK_AGENT_KIND: WandTaskAgentKind;
 export declare function isWandTaskAgentKind(value: unknown): value is WandTaskAgentKind;

package/dist/task-types.js

@@ -30,8 +30,6 @@ export function normalizeWandTaskAgentMode(provider, mode) {
         ? DEFAULT_WAND_TASK_AGENT_MODE
         : supported[0];
 }
-/** 合法会话形态清单；顺序即下拉顺序。 */
-export const WAND_TASK_AGENT_KINDS = ["structured", "pty"];
 /** 历史行 / 老客户端没带 kind 时的兜底：结构化对话，与旧派发行为一致。 */
 export const DEFAULT_WAND_TASK_AGENT_KIND = "structured";
 export function isWandTaskAgentKind(value) {

package/dist/tool-use-timestamps.d.ts

@@ -0,0 +1,3 @@
+import type { ContentBlock } from "./types.js";
+/** Preserve first-observed tool times across streaming replacements of an assistant turn. */
+export declare function stampNewToolUseTimes(content: ContentBlock[], previous: ContentBlock[] | undefined, observedAt: string, stampNew?: boolean): ContentBlock[];

package/dist/tool-use-timestamps.js

@@ -0,0 +1,27 @@
+/** Preserve first-observed tool times across streaming replacements of an assistant turn. */
+export function stampNewToolUseTimes(content, previous, observedAt, stampNew = true) {
+    const previousById = new Map();
+    for (const block of previous ?? []) {
+        if (block.type === "tool_use")
+            previousById.set(block.id, block);
+    }
+    return content.map((block) => {
+        if (block.type !== "tool_use")
+            return block;
+        const prior = previousById.get(block.id);
+        if (prior) {
+            // A persisted legacy invocation has no trustworthy per-tool time. Keep it absent.
+            if (!prior.occurredAt) {
+                if (!block.occurredAt)
+                    return block;
+                const { occurredAt: _ignored, ...withoutTime } = block;
+                return withoutTime;
+            }
+            return block.occurredAt === prior.occurredAt
+                ? block : { ...block, occurredAt: prior.occurredAt };
+        }
+        if (block.occurredAt || !stampNew)
+            return block;
+        return { ...block, occurredAt: observedAt };
+    });
+}

package/dist/types.d.ts

@@ -500,6 +500,18 @@ export interface ToolUseBlock {
     name: string;
     description?: string;
     input: Record<string, unknown>;
+    /** ISO time when the server first observed this tool invocation; absent for older transcripts. */
+    occurredAt?: string;
+    /** Small transport-only label; the complete input is fetched when a tool is opened. */
+    activity?: {
+        kind: "edit_file" | "read_file" | "run_command" | "other";
+        label: string;
+        /** Opaque, stable identifier for counting repeated accesses to one file. */
+        fileKey?: string;
+        hasImage?: boolean;
+        /** ISO time of the original invocation, never the snapshot/render time. */
+        occurredAt?: string;
+    };
     semantic?: ToolUseSemantic;
     __subagent?: SubagentMeta;
 }