@co0ontty/wand 4.106.0 → 4.106.1

package/dist/pty-tmux-log.d.ts

@@ -1,2 +1,2 @@
 /** Executed inside tmux's pipe-pane process. No launch environment or prompt is persisted. */
-export declare const ptyTmuxLogWriter = "\nconst fs=require('node:fs'),path=require('node:path');\nconst directory=process.argv[1];\nconst limit=1024*1024,keep=8;\nlet segment=0,size=0,carry=Buffer.alloc(0);\nlet fd=fs.openSync(path.join(directory,'0.chunk'),'a',0o600);\nprocess.stdin.on('data',data=>{\n  const scan=Buffer.concat([carry,data]);\n  const start=scan.lastIndexOf(Buffer.from('\\x1eWAND_CLI_EXIT:'));\n  if(start>=0){const end=scan.indexOf(31,start);if(end>=0){\n    const marker=scan.subarray(start,end+1);\n    fs.writeFileSync(path.join(directory,'marker.tmp'),marker,{mode:0o600});\n    fs.renameSync(path.join(directory,'marker.tmp'),path.join(directory,'marker'));\n  }}\n  carry=scan.subarray(Math.max(0,scan.length-512));\n  for(let offset=0;offset<data.length;){\n    if(size>=limit){fs.closeSync(fd);segment++;size=0;\n      fd=fs.openSync(path.join(directory,segment+'.chunk'),'a',0o600);\n      if(segment>=keep)fs.unlinkSync(path.join(directory,(segment-keep)+'.chunk'));\n    }\n    const length=Math.min(limit-size,data.length-offset);\n    fs.writeSync(fd,data,offset,length);offset+=length;size+=length;\n  }\n});\nprocess.stdin.on('end',()=>{fs.closeSync(fd);});\n";
+export declare const ptyTmuxLogWriter = "\nconst fs=require('node:fs'),path=require('node:path'),net=require('node:net');\nconst directory=process.argv[1];\nconst sockPath=process.argv[2];\nconst limit=1024*1024,keep=8;\nlet segment=0,size=0,carry=Buffer.alloc(0);\nlet fd=fs.openSync(path.join(directory,'0.chunk'),'a',0o600);\nconst clients=new Set();\nlet server=null;\nif(sockPath){\n  try{fs.unlinkSync(sockPath);}catch(e){}\n  server=net.createServer(socket=>{\n    try{socket.write(JSON.stringify({segment,size})+'\\n');}catch(e){}\n    clients.add(socket);\n    socket.on('close',()=>{clients.delete(socket);});\n    socket.on('error',()=>{clients.delete(socket);try{socket.destroy();}catch(e){}});\n  });\n  server.listen(sockPath,()=>{try{fs.chmodSync(sockPath,0o600);}catch(e){}});\n  process.on('exit',()=>{try{fs.unlinkSync(sockPath);}catch(e){}});\n}\nprocess.stdin.on('data',data=>{\n  const scan=Buffer.concat([carry,data]);\n  const start=scan.lastIndexOf(Buffer.from('\\x1eWAND_CLI_EXIT:'));\n  if(start>=0){const end=scan.indexOf(31,start);if(end>=0){\n    const marker=scan.subarray(start,end+1);\n    fs.writeFileSync(path.join(directory,'marker.tmp'),marker,{mode:0o600});\n    fs.renameSync(path.join(directory,'marker.tmp'),path.join(directory,'marker'));\n  }}\n  carry=scan.subarray(Math.max(0,scan.length-512));\n  for(let offset=0;offset<data.length;){\n    if(size>=limit){fs.closeSync(fd);segment++;size=0;\n      fd=fs.openSync(path.join(directory,segment+'.chunk'),'a',0o600);\n      if(segment>=keep)fs.unlinkSync(path.join(directory,(segment-keep)+'.chunk'));\n    }\n    const length=Math.min(limit-size,data.length-offset);\n    fs.writeSync(fd,data,offset,length);offset+=length;size+=length;\n  }\n  for(const client of clients){\n    try{client.write(data);}catch(e){}\n  }\n});\nprocess.stdin.on('end',()=>{\n  try{fs.closeSync(fd);}catch(e){}\n  for(const client of clients){try{client.end();}catch(e){}}\n  if(server){try{server.close(()=>{try{fs.unlinkSync(sockPath);}catch(e){}});}catch(e){}}\n});\n";

package/dist/pty-tmux-log.js

@@ -1,10 +1,24 @@
 /** Executed inside tmux's pipe-pane process. No launch environment or prompt is persisted. */
 export const ptyTmuxLogWriter = `
-const fs=require('node:fs'),path=require('node:path');
+const fs=require('node:fs'),path=require('node:path'),net=require('node:net');
 const directory=process.argv[1];
+const sockPath=process.argv[2];
 const limit=1024*1024,keep=8;
 let segment=0,size=0,carry=Buffer.alloc(0);
 let fd=fs.openSync(path.join(directory,'0.chunk'),'a',0o600);
+const clients=new Set();
+let server=null;
+if(sockPath){
+  try{fs.unlinkSync(sockPath);}catch(e){}
+  server=net.createServer(socket=>{
+    try{socket.write(JSON.stringify({segment,size})+'\\n');}catch(e){}
+    clients.add(socket);
+    socket.on('close',()=>{clients.delete(socket);});
+    socket.on('error',()=>{clients.delete(socket);try{socket.destroy();}catch(e){}});
+  });
+  server.listen(sockPath,()=>{try{fs.chmodSync(sockPath,0o600);}catch(e){}});
+  process.on('exit',()=>{try{fs.unlinkSync(sockPath);}catch(e){}});
+}
 process.stdin.on('data',data=>{
   const scan=Buffer.concat([carry,data]);
   const start=scan.lastIndexOf(Buffer.from('\\x1eWAND_CLI_EXIT:'));
@@ -22,6 +36,13 @@ process.stdin.on('data',data=>{
     const length=Math.min(limit-size,data.length-offset);
     fs.writeSync(fd,data,offset,length);offset+=length;size+=length;
   }
+  for(const client of clients){
+    try{client.write(data);}catch(e){}
+  }
+});
+process.stdin.on('end',()=>{
+  try{fs.closeSync(fd);}catch(e){}
+  for(const client of clients){try{client.end();}catch(e){}}
+  if(server){try{server.close(()=>{try{fs.unlinkSync(sockPath);}catch(e){}});}catch(e){}}
 });
-process.stdin.on('end',()=>{fs.closeSync(fd);});
 `;

package/dist/retention-protection.d.ts

@@ -1,5 +1,5 @@
 import type { WandStorage } from "./storage.js";
-import type { WandTask } from "./task-types.js";
+import { type WandTask } from "./task-types.js";
 import type { SessionSnapshot } from "./types.js";
 /** Read all ownership/execution facts before the first destructive action. Never loads transcripts or settings. */
 export declare function createRetentionProtection(storage: WandStorage, sessions: readonly SessionSnapshot[], archivedMs: number | null, now: number): {

package/dist/retention-protection.js

@@ -1,10 +1,11 @@
 import { AI_TEAM_ACTIVE_RUN_STATUSES } from "./ai-team-types.js";
 import { isArchiveBlocked } from "./archive-policy.js";
+import { taskHumanAccepted } from "./task-types.js";
 import { TASK_RETENTION_ARCHIVE_VERSION } from "./task-retention.js";
 import { parseTimestampMs } from "./time-utils.js";
 function acceptedTask(task) {
     const acceptance = task.acceptance;
-    return (task.status === "done" || task.status === "archived")
+    return taskHumanAccepted(task) && (task.status === "ready" || task.status === "archived")
         && typeof acceptance?.acceptedAt === "string" && parseTimestampMs(acceptance.acceptedAt) !== null
         && typeof acceptance.evidence === "string" && !!acceptance.evidence.trim()
         && typeof acceptance.blocker === "string" && !acceptance.blocker.trim();
@@ -123,7 +124,7 @@ export function createRetentionProtection(storage, sessions, archivedMs, now) {
     const unfinishedAncestors = spread(ancestors, unfinished);
     return {
         tasks, runs, teamSessionIds,
-        canArchiveTask: (task) => task.status === "done" && acceptedTask(task)
+        canArchiveTask: (task) => task.status === "ready" && taskHumanAccepted(task)
             && !executionHeld.has(taskNode(task.id)) && !unfinishedAncestors.has(taskNode(task.id)),
         canPurgeTask: (id) => !purgeHeld.has(taskNode(id)),
         canArchiveSession: (id) => !archiveHeld.has(sessionNode(id)),

package/dist/retention.d.ts

@@ -15,6 +15,11 @@ export interface RetentionDeps {
     sessions: SessionRegistry;
     /** 每次扫描读取。传入函数才能在设置保存后立刻用新窗口，而不是启动时的快照。 */
     taskRetention?: TaskRetentionSettings | (() => TaskRetentionSettings | undefined);
+    /**
+     * 归档或删除之后清掉不再属于任何未归档会话的 CLI 原生历史。
+     * 覆盖升级前就已归档、当时还没写清理的存量；本轮刚归档的 id 由调用方排除。
+     */
+    releaseArchivedProviderHistory?: (sessionIds: readonly string[]) => void;
 }
 export interface RetentionResult {
     archivedSessions: number;

package/dist/retention.js

@@ -122,6 +122,17 @@ export function runRetentionSweep(deps, now = Date.now()) {
         result.archivedTasks += 1;
     }
     sweepTeamRuns(deps, protection, taskWindows, snapshots, purgedSessionIds, archivedSessionIds, now, result);
+    // 本轮刚归档的会话已经由 setArchived 清过 CLI 历史。这里只补更早的存量，
+    // 避免和本轮写入抢同一批文件。
+    const staleArchived = snapshots
+        .filter((session) => session.archived && !archivedSessionIds.has(session.id) && !purgedSessionIds.has(session.id))
+        .map((session) => session.id);
+    if (staleArchived.length > 0) {
+        try {
+            deps.releaseArchivedProviderHistory?.(staleArchived);
+        }
+        catch { /* 清理失败不回滚归档 */ }
+    }
     return result;
 }
 function archiveRetentionSession(deps, session, archivedSessionIds, result) {

package/dist/server-knowledge-routes.js

@@ -6,8 +6,8 @@ function fields(value) {
 }
 function namespace(value) {
     const data = fields(value);
-    if (data.scope !== "personal" && data.scope !== "project")
-        throw new KnowledgeError("请选择个人或项目知识库。");
+    if (data.scope !== "global" && data.scope !== "personal" && data.scope !== "project")
+        throw new KnowledgeError("请选择全局、个人或项目知识库。");
     if (typeof data.ownerId !== "string" || !data.ownerId.trim() || data.ownerId.length > 200)
         throw new KnowledgeError("请选择员工或项目。");
     return { scope: data.scope, ownerId: data.ownerId };

package/dist/server-session-input-routes.js

@@ -36,6 +36,8 @@ export function registerSessionInputRoutes(app, ctx) {
         // 让退出 handler 不要把剩余 queuedMessages 清空（默认行为是清空）。
         const preserveQueue = !!req.body?.preserveQueue;
         const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
+        let inputReceipt;
+        let inputAccepted = false;
         try {
             const session = structured.get(req.params.id);
             if (!session) {
@@ -43,19 +45,22 @@ export function registerSessionInputRoutes(app, ctx) {
                 return;
             }
             const snapshot = await structured.sendMessage(req.params.id, input, {
+                onAccepted: receipt => { inputAccepted = true; inputReceipt = receipt; },
                 interrupt,
                 preserveQueue,
                 idempotencyKey,
                 source: "user",
             });
-            res.json(sessionResponseDTO(snapshot, req));
+            res.json({ ...sessionResponseDTO(snapshot, req), ...(inputReceipt ? { inputReceipt } : {}) });
         }
         catch (error) {
             const errorCode = error?.code;
-            const status = errorCode === "duplicate_idempotency_key" || errorCode === "duplicate_queued_message" ? 409 : 400;
+            const status = inputAccepted ? 503
+                : errorCode === "idempotency_key_conflict" || errorCode === "duplicate_idempotency_key" || errorCode === "duplicate_queued_message" ? 409 : 400;
             res.status(status).json({
                 error: getErrorMessage(error, "无法发送结构化消息。"),
-                errorCode,
+                errorCode: inputAccepted ? "INPUT_DELIVERY_UNCONFIRMED" : errorCode,
+                ...(inputReceipt ? { inputReceipt } : {}),
             });
         }
     }));
@@ -73,7 +78,7 @@ export function registerSessionInputRoutes(app, ctx) {
             res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
-            sendRouteError(res, surfaceDomainError(error, /^(排序长度与当前队列不一致，请刷新后重试。|排序参数无效。|排队消息已变化，请刷新后重试。)$/) ?? error, "无法调整排队顺序。");
+            sendRouteError(res, surfaceDomainError(error, /^(排序长度与当前队列不一致，请刷新后重试。|排序参数无效。|排队消息已变化，请刷新后重试。|排队消息正在交接，请按最新状态重试。)$/) ?? error, "无法调整排队顺序。");
         }
     });
     app.patch("/api/structured-sessions/:id/queued/:index", (req, res) => {
@@ -86,7 +91,7 @@ export function registerSessionInputRoutes(app, ctx) {
             res.json(sessionResponseDTO(structured.editQueuedMessage(req.params.id, Number(req.params.index), expectedText, text), req));
         }
         catch (error) {
-            sendRouteError(res, surfaceDomainError(error, /^(排队消息已变化，请刷新后重试。|排队消息不能为空。)$/) ?? error, "无法编辑排队消息。");
+            sendRouteError(res, surfaceDomainError(error, /^(排队消息已变化，请刷新后重试。|排队消息不能为空。|排队消息正在交接，请按最新状态重试。)$/) ?? error, "无法编辑排队消息。");
         }
     });
     app.delete("/api/structured-sessions/:id/queued/:index", (req, res) => {
@@ -101,7 +106,7 @@ export function registerSessionInputRoutes(app, ctx) {
             res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
-            sendRouteError(res, surfaceDomainError(error, /^(队列中没有该条消息（可能已被处理）。|排队消息已变化，请按最新顺序重试。)$/) ?? error, "无法删除排队消息。");
+            sendRouteError(res, surfaceDomainError(error, /^(队列中没有该条消息（可能已被处理）。|排队消息已变化，请按最新顺序重试。|排队消息正在交接，请按最新状态重试。)$/) ?? error, "无法删除排队消息。");
         }
     });
     app.post("/api/structured-sessions/:id/queued/:index/promote", asyncRoute(async (req, res) => {
@@ -112,16 +117,22 @@ export function registerSessionInputRoutes(app, ctx) {
         }
         const expectedText = typeof req.body?.expectedText === "string" ? req.body.expectedText : undefined;
         const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
+        let inputAccepted = false;
+        let inputReceipt;
         try {
-            const snapshot = await structured.promoteQueuedMessage(req.params.id, index, expectedText, idempotencyKey);
-            res.json(sessionResponseDTO(snapshot, req));
+            const snapshot = await structured.promoteQueuedMessage(req.params.id, index, expectedText, idempotencyKey, receipt => {
+                inputAccepted = true;
+                inputReceipt = receipt;
+            });
+            res.json({ ...sessionResponseDTO(snapshot, req), ...(inputReceipt ? { inputReceipt } : {}) });
         }
         catch (error) {
             const errorCode = error?.code;
-            const status = errorCode === "duplicate_idempotency_key" ? 409 : 400;
+            const status = inputAccepted ? 503 : errorCode === "idempotency_key_conflict" || errorCode === "duplicate_idempotency_key" ? 409 : 400;
             res.status(status).json({
                 error: getErrorMessage(error, "无法立即发送排队消息。"),
-                errorCode,
+                errorCode: inputAccepted ? "INPUT_DELIVERY_UNCONFIRMED" : errorCode,
+                ...(inputReceipt ? { inputReceipt } : {}),
             });
         }
     }));
@@ -141,16 +152,21 @@ export function registerSessionInputRoutes(app, ctx) {
         const input = body.input ?? "";
         const view = body.view;
         const shortcutKey = body.shortcutKey;
+        let inputReceipt;
+        let inputAccepted = false;
         try {
             if (structured.get(sessionId)) {
-                const completion = structured.sendMessage(sessionId, input, { source: "user" });
+                let confirmAcceptance;
+                const acceptance = new Promise(resolve => { confirmAcceptance = resolve; });
+                const completion = structured.sendMessage(sessionId, input, { source: "user",
+                    idempotencyKey: body.idempotencyKey,
+                    onAccepted: receipt => { inputAccepted = true; inputReceipt = receipt; confirmAcceptance(); },
+                });
                 if (body.respondImmediately === true || (structured.get(sessionId)?.provider === "pi"
                     && structured.get(sessionId)?.piSettings?.autoResources === true)) {
-                    // sendMessage updates the canonical snapshot synchronously before it
-                    // starts awaiting the runner. Native clients should not hold this
-                    // request open for an entire model turn (which can exceed their HTTP
-                    // timeout, especially while the first-turn title job is also active).
-                    // The normal structured events continue to carry progress/failure.
+                    // Reject before returning 202 if validation/storage did not accept the
+                    // input. After acceptance, execution failures arrive on the event stream.
+                    await Promise.race([acceptance, completion]);
                     completion.catch((error) => {
                         console.error("[wand] Accepted structured input later failed", {
                             sessionId,
@@ -161,11 +177,11 @@ export function registerSessionInputRoutes(app, ctx) {
                     if (!accepted) {
                         throw badRequest("未找到该结构化会话。");
                     }
-                    res.status(202).json(sessionResponseDTO(accepted, req));
+                    res.status(202).json({ ...sessionResponseDTO(accepted, req), ...(inputReceipt ? { inputReceipt } : {}) });
                     return;
                 }
                 const snapshot = await completion;
-                res.json(sessionResponseDTO(snapshot, req));
+                res.json({ ...sessionResponseDTO(snapshot, req), ...(inputReceipt ? { inputReceipt } : {}) });
                 return;
             }
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
@@ -190,7 +206,10 @@ export function registerSessionInputRoutes(app, ctx) {
             res.json(sessionResponseDTO(snapshot, req));
         }
         catch (error) {
-            const response = getInputErrorResponse(error, sessionId);
+            const response = inputAccepted
+                ? { statusCode: 503, payload: { error: getErrorMessage(error), errorCode: "INPUT_DELIVERY_UNCONFIRMED",
+                        ...(inputReceipt ? { inputReceipt } : {}), sessionId, sessionStatus: structured.get(sessionId)?.status ?? null } }
+                : getInputErrorResponse(error, sessionId);
             console.error("[wand] Input request failed", {
                 sessionId, inputLength: input.length, view: view ?? "chat",
                 responseStatus: response.statusCode, responsePayload: response.payload,

package/dist/server-session-lifecycle-routes.js

@@ -27,6 +27,19 @@ export function registerSessionLifecycleRoutes(app, ctx) {
     app.post("/api/sessions", asyncRoute(async (req, res) => {
         const body = req.body;
         try {
+            const isWorktreeMergeRequest = !body.employeeId && ((typeof body.systemPrompt === "string" && body.systemPrompt.includes("Worktree 合并 Agent"))
+                || (typeof body.initialInput === "string" && body.initialInput.includes("Worktree 合并 Agent"))
+                || (typeof body.prompt === "string" && body.prompt.includes("Worktree 合并 Agent")));
+            if (isWorktreeMergeRequest) {
+                body.kind = "structured";
+                body.employeeId = "e_wand_ops";
+                if (body.initialInput && !body.prompt) {
+                    body.prompt = body.initialInput;
+                    delete body.initialInput;
+                }
+                delete body.command;
+                delete body.provider;
+            }
             if (body.kind !== "structured" && body.kind !== "pty")
                 throw badRequest("kind 必须是 structured 或 pty。");
             if (body.prompt !== undefined && typeof body.prompt !== "string")
@@ -205,7 +218,7 @@ export function registerSessionLifecycleRoutes(app, ctx) {
             res.status(201).json(sessionResponseDTO(structured.get(snapshot.id) ?? snapshot, req));
         }
         catch (error) {
-            sendRouteError(res, surfaceDomainError(error, /Wand Agent|harness|core/i) ?? error, "无法启动结构化会话。");
+            sendRouteError(res, surfaceDomainError(error, /Wand Agent|harness|core/i) ?? error, body.kind === "pty" ? "无法启动终端会话。" : "无法启动结构化会话。");
         }
     }));
     app.put("/api/sessions/:id/quick-terminal", (req, res) => {

package/dist/server-session-worktree-routes.js

@@ -1,14 +1,17 @@
 import { generateCommitMessageOnly, getGitStatusAsync, QuickCommitError, runPush, runQuickCommitWithFallback, runTagHead, } from "./git-quick-commit.js";
 import { checkSessionWorktreeMergeabilityAsync, cleanupSessionWorktreeAsync, mergeSessionWorktreeAsync } from "./git-worktree.js";
 import { resolveSystemAiContext } from "./session-ai-context.js";
+import { listGitWorktrees, mergeAllWorktreesAndPush, withGitRepositoryOperation } from "./git-worktree-batch.js";
 import { getErrorMessage } from "./error-utils.js";
 import { asyncRoute } from "./express-async.js";
 import { buildIterationCommitContext, COMMIT_CONTEXT_MODE_PREF_KEY, isCommitContextMode } from "./iteration-log.js";
 import { sendRouteError } from "./server-request.js";
-import { commitModeForRead, iterationCommitInput, commitMessageFromIteration, requireWorktreeSession, saveWorktreeMergeState, getWorktreeMergeResponseStatus, getWorktreeMergePayload, canMergeSession, isMergeActionAllowed } from "./session-service.js";
+import { commitModeForRead, iterationCommitInput, commitMessageFromIteration, requireWorktreeSession, saveWorktreeMergeState, getWorktreeMergeResponseStatus, getWorktreeMergePayload, canMergeSession, isMergeActionAllowed, getInputDebugMeta } from "./session-service.js";
+import { selectEmployeeCandidate } from "./silicon-employee-dispatch.js";
+import { resolveExplicitOrFallbackModel } from "./session-model.js";
 /** Worktree merge/cleanup, git status/commit/push and iteration context routes. */
 export function registerSessionWorktreeRoutes(app, ctx) {
-    const { storage, config, sessions, free, wantsCompactTools, sessionResponseDTO, } = ctx;
+    const { storage, config, sessions, free, structured, onSessionCreated, wantsCompactTools, sessionResponseDTO, } = ctx;
     app.post("/api/sessions/:id/worktree/merge/check", asyncRoute(async (req, res) => {
         try {
             const current = requireWorktreeSession(sessions.getLatest(req.params.id));
@@ -50,10 +53,10 @@ export function registerSessionWorktreeRoutes(app, ctx) {
                 lastError: undefined,
                 conflict: false,
             });
-            const result = await mergeSessionWorktreeAsync({
+            const result = await withGitRepositoryOperation(merging.worktree.repoRoot ?? merging.cwd, () => mergeSessionWorktreeAsync({
                 worktree: merging.worktree,
                 targetBranch: current.worktreeMergeInfo?.targetBranch,
-            });
+            }));
             const updated = saveWorktreeMergeState(sessions, merging, "merged", {
                 targetBranch: result.targetBranch,
                 mergedAt: result.mergedAt,
@@ -92,12 +95,37 @@ export function registerSessionWorktreeRoutes(app, ctx) {
             return;
         }
         try {
-            res.json(await getGitStatusAsync(snapshot.cwd));
+            const status = await getGitStatusAsync(snapshot.cwd);
+            const worktreeCount = status.isGit ? Math.max(0, (await listGitWorktrees(snapshot.cwd)).length - 1) : 0;
+            res.json({ ...status, worktreeCount });
         }
         catch (error) {
             res.json({ isGit: false, error: getErrorMessage(error, "无法读取 git 状态。") });
         }
     }));
+    app.post("/api/sessions/:id/git/merge-worktrees", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
+        if (!snapshot) {
+            res.status(404).json({ error: "未找到该会话。" });
+            return;
+        }
+        if (!snapshot.cwd) {
+            res.status(400).json({ error: "会话没有工作目录。" });
+            return;
+        }
+        const { expectedBranch, expectedHead } = req.body ?? {};
+        if (typeof expectedBranch !== "string" || !expectedBranch.trim()
+            || typeof expectedHead !== "string" || !/^[a-f0-9]{40,64}$/.test(expectedHead)) {
+            res.status(400).json({ error: "请先刷新 Git 状态，确认当前分支与提交。" });
+            return;
+        }
+        try {
+            res.json(await mergeAllWorktreesAndPush({ cwd: snapshot.cwd, expectedBranch, expectedHead }));
+        }
+        catch (error) {
+            sendRouteError(res, error, "无法合并 Worktree。");
+        }
+    }));
     app.post("/api/sessions/:id/quick-commit", asyncRoute(async (req, res) => {
         const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
@@ -113,7 +141,7 @@ export function registerSessionWorktreeRoutes(app, ctx) {
             const ai = resolveSystemAiContext(snapshot, config, storage.getSystemSiliconEmployee(), free, { storage });
             // 自动 message + 迭代模式：拿本轮提示词当输入；提交成功后标记已用掉。
             const context = await iterationCommitInput(storage, snapshot, body);
-            const result = await runQuickCommitWithFallback({
+            const result = await withGitRepositoryOperation(snapshot.cwd, () => runQuickCommitWithFallback({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
                 ...ai,
@@ -125,7 +153,7 @@ export function registerSessionWorktreeRoutes(app, ctx) {
                 submodule: !!body.submodule,
                 iterationDigest: commitMessageFromIteration(body) ? context.digest : "",
                 includeDiff: !!body.includeDiff,
-            });
+            }));
             const consumed = result.ok && result.commit?.hash && context.entryIds.length > 0
                 ? storage.markIterationPromptsConsumed(context.entryIds, result.commit.hash)
                 : 0;
@@ -232,14 +260,14 @@ export function registerSessionWorktreeRoutes(app, ctx) {
         const body = (req.body ?? {});
         try {
             const ai = resolveSystemAiContext(snapshot, config, storage.getSystemSiliconEmployee(), free, { storage });
-            const result = await runTagHead({
+            const result = await withGitRepositoryOperation(snapshot.cwd, () => runTagHead({
                 cwd: snapshot.cwd,
                 language: config.language ?? "",
                 ...ai,
                 tag: typeof body.tag === "string" ? body.tag : undefined,
                 autoTag: !!body.autoTag,
                 push: !!body.push,
-            });
+            }));
             res.json(result);
         }
         catch (error) {
@@ -263,13 +291,13 @@ export function registerSessionWorktreeRoutes(app, ctx) {
         }
         const body = (req.body ?? {});
         try {
-            const result = await runPush({
+            const result = await withGitRepositoryOperation(snapshot.cwd, () => runPush({
                 cwd: snapshot.cwd,
                 pushCommits: body.pushCommits !== false,
                 pushTags: !!body.pushTags,
                 submodule: !!body.submodule,
                 tagName: typeof body.tag === "string" ? body.tag : undefined,
-            });
+            }));
             res.json(result);
         }
         catch (error) {
@@ -287,7 +315,7 @@ export function registerSessionWorktreeRoutes(app, ctx) {
                 res.status(400).json({ error: "当前 worktree 无需补偿清理。", errorCode: "WORKTREE_CLEANUP_NOT_NEEDED" });
                 return;
             }
-            await cleanupSessionWorktreeAsync({ worktree: current.worktree });
+            await withGitRepositoryOperation(current.worktree.repoRoot ?? current.cwd, () => cleanupSessionWorktreeAsync({ worktree: current.worktree }));
             const updated = saveWorktreeMergeState(sessions, current, "merged", {
                 ...(current.worktreeMergeInfo ?? null),
                 cleanupDone: true,
@@ -300,4 +328,69 @@ export function registerSessionWorktreeRoutes(app, ctx) {
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法清理 worktree。"));
         }
     }));
+    app.post("/api/workspaces/:id/worktree-merge-agent", asyncRoute(async (req, res) => {
+        const workspace = storage.getWorkspace(req.params.id);
+        if (!workspace) {
+            res.status(404).json({ error: "未找到该项目。" });
+            return;
+        }
+        const prompt = typeof req.body?.prompt === "string" ? req.body.prompt.trim() : "";
+        if (!prompt) {
+            res.status(400).json({ error: "请输入合并任务书内容。" });
+            return;
+        }
+        const systemPromptOverride = typeof req.body?.systemPrompt === "string" ? req.body.systemPrompt.trim() : "";
+        // 所有系统自动发起的系统功能调用（包含 Worktree 合并）统一使用「勤劳的初二」
+        const employee = storage.getSystemSiliconEmployee() ?? storage.ensureSystemSiliconEmployee();
+        const candidate = selectEmployeeCandidate(employee);
+        const agent = candidate.agent;
+        const provider = agent.provider;
+        const mode = agent.mode ?? "managed";
+        const requestedEngine = agent.engine;
+        const model = agent.model && agent.model !== "default"
+            ? agent.model
+            : resolveExplicitOrFallbackModel(config, provider, agent.model);
+        const baseSystemPrompt = systemPromptOverride || [
+            `你是 Wand 为项目「${workspace.name}」启动的 Worktree 合并 Agent。`,
+            `项目主工作区：${workspace.cwd}`,
+            "",
+            employee.prompt,
+        ].join("\n");
+        const engineDecision = requestedEngine ? await structured.resolveNewSessionPiEngine(requestedEngine) : null;
+        const snapshot = structured.createSession({
+            cwd: workspace.cwd,
+            mode,
+            provider,
+            runner: undefined,
+            worktreeEnabled: false,
+            model,
+            thinkingEffort: agent.thinkingEffort ?? config.defaultThinkingEffort,
+            sessionSource: "interactive",
+            workspaceId: workspace.id,
+            systemPrompt: baseSystemPrompt,
+            employeeId: employee.id,
+            employeeName: employee.name,
+            employeeAvatar: employee.avatar,
+            employeeCandidates: employee.agents,
+            employeeCandidateIndex: candidate.index,
+            title: `合并 Worktree - ${workspace.name}`,
+            ...(engineDecision ? { engine: engineDecision.engine } : {}),
+        });
+        onSessionCreated?.(snapshot.cwd);
+        try {
+            Promise.resolve(structured.sendMessage(snapshot.id, prompt, { source: "user" })).catch((error) => {
+                console.error("[wand] Accepted merge agent prompt later failed", {
+                    sessionId: snapshot.id,
+                    error: getInputDebugMeta(error),
+                });
+            });
+        }
+        catch (error) {
+            console.error("[wand] Accepted merge agent prompt later failed", {
+                sessionId: snapshot.id,
+                error: getInputDebugMeta(error),
+            });
+        }
+        res.status(201).json(wantsCompactTools(req) ? sessionResponseDTO(snapshot, req) : snapshot);
+    }));
 }

package/dist/server-task-routes.js

@@ -20,7 +20,7 @@ import { TaskReadModel } from "./task-read-model.js";
 import { readTaskActions } from "./task-actions.js";
 import { refreshAutoBoardTaskTitles, taskTitleService } from "./task-title-service.js";
 import { provisionalTaskTitleFromDescription } from "./task-title.js";
-import { isWandTaskStatus, statusAfterWandTaskDispatch } from "./task-types.js";
+import { isWandTaskStatus, taskWorkflowStage, statusAfterWandTaskDispatch } from "./task-types.js";
 import { DEFAULT_WAND_TASK_AGENT_KIND, DEFAULT_WAND_TASK_AGENT_MODE, DEFAULT_WAND_TASK_PRIORITY, WAND_MILESTONE_NAME_MAX_LENGTH } from "./task-types.js";
 import { badRequest, surfaceDomainError } from "./http-error.js";
 import { parseTaskAgent, parentTaskIdFrom } from "./task-agent-parsing.js";
@@ -157,6 +157,9 @@ function taskDto({ storage, sessions }, task, model) {
         : task.executionSubject?.type === "team" ? storage.getAiTeam(task.executionSubject.id) : null;
     return {
         ...task,
+        status: taskWorkflowStage(task.status),
+        workflowVersion: 1,
+        ...(task.status === "done" ? { legacyReview: true } : {}),
         commentCount: model ? model.commentCounts.get(task.id) ?? 0 : storage.countWandTaskComments(task.id),
         queuedCommentCount: model ? model.queuedCommentCounts.get(task.id) ?? 0 : storage.countQueuedTaskCommentDispatchesForTask(task.id),
         ...(model ? model.execution(task) : taskExecutionProjection(sessionIds.flatMap(id => {
@@ -333,6 +336,8 @@ export function registerTaskRoutes(app, deps) {
             const titleSource = providedTitle ? "user" : "auto";
             const title = providedTitle || provisionalTaskTitleFromDescription(description) || "新建任务";
             const status = isWandTaskStatus(body.status) ? body.status : "todo";
+            if (!["backlog", "todo", "doing"].includes(status))
+                throw badRequest("新建任务不能冒充已交付或已验收，请先创建再提交交付。");
             const priority = PRIORITIES.has(body.priority) ? body.priority : DEFAULT_WAND_TASK_PRIORITY;
             const agent = body.agent === undefined ? null : parseTaskAgent(body.agent);
             const executionSubject = body.executionSubject === undefined
@@ -353,8 +358,10 @@ export function registerTaskRoutes(app, deps) {
             const requestedMilestoneId = milestoneIdFrom(storage, body.milestoneId) ?? defaultMilestoneIdForWrite(storage);
             const milestoneId = scopedMilestoneId(storage, requestedMilestoneId, workspaceId)
                 ?? defaultMilestoneIdForWrite(storage);
+            const cwd = typeof body.cwd === "string" && body.cwd.trim() ? text(body.cwd) : undefined;
             const task = storage.createWandTask({
                 workspaceId,
+                cwd,
                 parentTaskId,
                 title,
                 titleSource,
@@ -392,6 +399,15 @@ export function registerTaskRoutes(app, deps) {
                 res.status(404).json({ error: "未找到该任务。" });
                 return;
             }
+            if (body.workflow !== undefined) {
+                if (Object.keys(body).some(key => key !== "workflow"))
+                    throw badRequest("工作流动作不能与其他编辑混合提交。");
+                const result = storage.applyTaskWorkflow(currentTask.id, body.workflow, { kind: "user" }, sessions);
+                res.json(dto(result));
+                return;
+            }
+            if (body.verification !== undefined || body.deliveryRevision !== undefined || body.legacyReview !== undefined)
+                throw badRequest("验收版本与 AI 结论只能通过工作流写入。");
             const patch = {};
             if (body.title !== undefined) {
                 // 显式改标题（包括原生端的可编辑标题框）都算用户自己写的。
@@ -407,17 +423,22 @@ export function registerTaskRoutes(app, deps) {
                 const acceptance = bodyObject(body.acceptance);
                 const evidence = text(acceptance.evidence).slice(0, 16000);
                 const blocker = text(acceptance.blocker).slice(0, 4000);
-                const accepted = acceptance.acceptedAt != null;
-                if (accepted && (!evidence || blocker))
-                    throw badRequest("验收通过需要交付证据，并先解除阻塞。");
-                if (accepted && storage.listWandTasks().some(child => child.parentTaskId === currentTask.id && !child.acceptance?.acceptedAt))
-                    throw badRequest("仍有子任务未验收通过，不能通过主目标整体验收。");
-                patch.acceptance = { evidence, blocker, acceptedAt: accepted ? new Date().toISOString() : null };
+                if (acceptance.acceptedAt != null || acceptance.confirmedRevision !== undefined)
+                    throw badRequest("请使用‘确认并归档’工作流；保存证据不能代替人工确认。");
+                patch.acceptance = { evidence, blocker, acceptedAt: null };
             }
             if (body.status !== undefined) {
                 if (!isWandTaskStatus(body.status))
                     throw badRequest("任务状态无效。");
-                patch.status = body.status;
+                if (body.status !== taskWorkflowStage(currentTask.status) && body.status !== currentTask.status) {
+                    if (body.status === "archived") {
+                        res.status(409).json({ error: "请先核对 AI 验收，再由人工确认并归档。" });
+                        return;
+                    }
+                    if (!["backlog", "todo", "doing"].includes(body.status))
+                        throw badRequest("验收、待归档和归档只能通过明确的验收动作流转。");
+                    patch.status = body.status;
+                }
             }
             if (body.priority !== undefined) {
                 if (!PRIORITIES.has(body.priority))
@@ -584,6 +605,8 @@ export function registerTaskRoutes(app, deps) {
                 res.status(404).json({ error: "未找到该任务。" });
                 return;
             }
+            if (task.status === "archived")
+                throw badRequest("归档任务需要先恢复，再新建执行。");
             if (!config)
                 throw badRequest("当前服务未启用派发，无法派发 Agent。");
             const body = bodyObject(req.body);
@@ -594,6 +617,12 @@ export function registerTaskRoutes(app, deps) {
                 && (body.kind === "pty" || (body.agent && bodyObject(body.agent).kind === "pty"))) {
                 throw badRequest("PTY 只能选择 CLI 工具。");
             }
+            const reviewing = body.purpose === "review";
+            if (body.purpose !== undefined && body.purpose !== "review" && body.purpose !== "execution")
+                throw badRequest("派发目的无效。");
+            if (reviewing && (taskWorkflowStage(task.status) !== "review" || subject?.type !== "employee"))
+                throw badRequest("AI 验收请在待验收阶段明确选择员工，以获得当前任务的受限回填能力。");
+            const dispatchStatus = reviewing ? "review" : statusAfterWandTaskDispatch(task.status);
             const requestedPrompt = text(body.prompt);
             const existingSessions = storage.listWandTaskSessionIds(task.id).length;
             if (existingSessions > 0 && !requestedPrompt)
@@ -621,7 +650,7 @@ export function registerTaskRoutes(app, deps) {
                 storage.updateWandTask(task.id, {
                     executionSubject: subject,
                     agent: preferredAgent,
-                    status: statusAfterWandTaskDispatch(task.status),
+                    status: dispatchStatus,
                 });
                 recordIterationPromptForTask(storage, {
                     sessionId: detail.run.chatSessionId ?? undefined,
@@ -685,12 +714,12 @@ export function registerTaskRoutes(app, deps) {
             // Compatibility creation/drag clients also enter the same durable comment path for employees.
             // No implicit description fallback: a first dispatch needs an explicit round instruction too.
             if (employee) {
-                const result = await submitTaskComment(deps, task.id, { requestId: text(body.requestId) || randomUUID(), body: requestedPrompt, employeeId: employee.id }, override ?? undefined);
+                const result = await submitTaskComment(deps, task.id, { requestId: text(body.requestId) || randomUUID(), body: requestedPrompt, employeeId: employee.id, purpose: reviewing ? "review" : "execution" }, override ?? undefined);
                 const session = result.comment.dispatch?.sessionId ? sessions?.getSlim(result.comment.dispatch.sessionId)
                     ?? storage.getSessionSlim(result.comment.dispatch.sessionId) : null;
                 // 排队中的派发同样要把任务挂到员工并保持活动；不能因为没有会话就跳过。
                 if (result.comment.dispatch)
-                    storage.updateWandTask(task.id, { agent, executionSubject: { type: "employee", id: employee.id, ...(override ? { agentOverride: override } : {}) }, status: statusAfterWandTaskDispatch(task.status) });
+                    storage.updateWandTask(task.id, { agent, executionSubject: { type: "employee", id: employee.id, ...(override ? { agentOverride: override } : {}) }, status: dispatchStatus });
                 res.status(202).json({ ok: true, taskId: task.id, subject: { type: "employee", id: employee.id }, comment: result.comment,
                     queued: result.comment.dispatch?.state === "queued",
                     session: session ? { ...taskSessionSummary(session), employeeCandidateIndex: session.employeeCandidateIndex } : null });
@@ -702,7 +731,7 @@ export function registerTaskRoutes(app, deps) {
             storage.updateWandTask(task.id, {
                 agent,
                 executionSubject: usedSubject,
-                status: statusAfterWandTaskDispatch(task.status),
+                status: dispatchStatus,
             });
             if (body.rememberAgentDefaults === true && !employee)
                 writeTaskBoardLastAgent(storage, agent);