@co0ontty/wand 4.60.0 → 4.61.0-beta.g14d0be2

package/dist/server-resume-routes.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 按 provider 原生会话 ID 恢复 structured 会话的路由。
+ *
+ * 两条历史路径含义不同，必须分开表达：
+ *  - `codex` / `opencode` / `qoder` 的历史由 Wand 扫描出来，缺 `cwd` 时可以从历史补齐；
+ *  - `grok` / `pi` 的恢复 ID 由客户端自己持有，服务端无法反查记录，必须显式带 `cwd`。
+ *
+ * 以前每个 provider 各抄一份 handler（5 份几乎相同的 200 行）；现在只有一个
+ * 恢复流程，provider 之间的差异收敛成 `StructuredResumeSpec` 里的几个字段。
+ */
+import type { Express } from "express";
+import type { ProcessManager } from "./process-manager.js";
+import type { StructuredSessionManager } from "./structured-session-manager.js";
+import type { WandStorage } from "./storage.js";
+import type { ExecutionMode, SessionSnapshot } from "./types.js";
+export interface ResumeRouteDependencies {
+    processes: ProcessManager;
+    structured: StructuredSessionManager;
+    storage: WandStorage;
+    defaultMode: ExecutionMode;
+    onSessionCreated?: (cwd: string | undefined | null) => void;
+    /** 会话快照 → 响应 DTO；由调用方注入以免这里再依赖消息截断层。 */
+    toDetailDTO: (snapshot: SessionSnapshot) => unknown;
+}
+export declare function registerStructuredResumeRoutes(app: Express, deps: ResumeRouteDependencies): void;

package/dist/server-resume-routes.js

@@ -0,0 +1,124 @@
+/**
+ * 按 provider 原生会话 ID 恢复 structured 会话的路由。
+ *
+ * 两条历史路径含义不同，必须分开表达：
+ *  - `codex` / `opencode` / `qoder` 的历史由 Wand 扫描出来，缺 `cwd` 时可以从历史补齐；
+ *  - `grok` / `pi` 的恢复 ID 由客户端自己持有，服务端无法反查记录，必须显式带 `cwd`。
+ *
+ * 以前每个 provider 各抄一份 handler（5 份几乎相同的 200 行）；现在只有一个
+ * 恢复流程，provider 之间的差异收敛成 `StructuredResumeSpec` 里的几个字段。
+ */
+import { asyncRoute } from "./express-async.js";
+import { getErrorMessage } from "./error-utils.js";
+import { isProviderSessionId, isSafeProviderSessionId } from "./resume-policy.js";
+import { parseExecutionMode, parseSessionCreationOrigin } from "./server-session-routes.js";
+import { resolveWorkspaceIdForNewSession } from "./workspace-binding.js";
+const STRUCTURED_RESUME_SPECS = [
+    {
+        path: "/api/codex-sessions/:nativeId/resume",
+        param: "nativeId",
+        spec: {
+            label: "Codex",
+            provider: "codex",
+            runner: "codex-cli-exec",
+            nativeIdKey: "claudeSessionId",
+            idFormat: "uuid",
+            findHistory: (processes, nativeId) => processes.listCodexHistorySessions().find((session) => session.claudeSessionId === nativeId),
+        },
+    },
+    {
+        path: "/api/opencode-sessions/:nativeId/resume",
+        param: "nativeId",
+        spec: {
+            label: "OpenCode",
+            provider: "opencode",
+            runner: "opencode-cli-run",
+            nativeIdKey: "claudeSessionId",
+            idFormat: "safe",
+            findHistory: (processes, nativeId) => processes.listOpenCodeHistorySessions().find((session) => session.claudeSessionId === nativeId),
+        },
+    },
+    {
+        path: "/api/qoder-sessions/:nativeId/resume",
+        param: "nativeId",
+        spec: {
+            label: "Qoder",
+            provider: "qoder",
+            runner: "qoder-cli-print",
+            nativeIdKey: "claudeSessionId",
+            idFormat: "safe",
+            findHistory: (processes, nativeId) => processes.listQoderHistorySessions().find((session) => session.claudeSessionId === nativeId),
+        },
+    },
+    {
+        path: "/api/grok-sessions/:nativeId/resume",
+        param: "nativeId",
+        spec: {
+            label: "Grok",
+            provider: "grok",
+            runner: "grok-cli-headless",
+            nativeIdKey: "claudeSessionId",
+            idFormat: "safe",
+        },
+    },
+    {
+        path: "/api/pi-sessions/:nativeId/resume",
+        param: "nativeId",
+        spec: {
+            label: "Pi",
+            provider: "pi",
+            runner: "pi-cli-json",
+            nativeIdKey: "claudeSessionId",
+            idFormat: "safe",
+        },
+    },
+];
+/** 参数是合法 UUID 时用 `isProviderSessionId`，否则用宽松校验；返回错误文案或 null。 */
+function validateNativeId(nativeId, spec) {
+    if (spec.idFormat === "uuid") {
+        return isProviderSessionId(nativeId) ? null : `${spec.label} 会话 ID 必须是有效的 UUID。`;
+    }
+    return isSafeProviderSessionId(nativeId) ? null : `${spec.label} 会话 ID 格式无效。`;
+}
+export function registerStructuredResumeRoutes(app, deps) {
+    const { processes, structured, storage, defaultMode, onSessionCreated, toDetailDTO } = deps;
+    for (const { path, param, spec } of STRUCTURED_RESUME_SPECS) {
+        app.post(path, asyncRoute(async (req, res) => {
+            const nativeId = String(req.params[param] || "").trim();
+            const body = (req.body ?? {});
+            try {
+                const invalid = validateNativeId(nativeId, spec);
+                if (invalid) {
+                    res.status(400).json({ error: invalid });
+                    return;
+                }
+                const history = spec.findHistory?.(processes, nativeId);
+                if (spec.findHistory && !history) {
+                    res.status(400).json({ error: `对应的 ${spec.label} 历史会话不存在，无法恢复。` });
+                    return;
+                }
+                // 自持 ID 的 provider（Grok / Pi）无法反查历史，必须由客户端给 cwd。
+                const cwd = body.cwd?.trim() || history?.cwd;
+                if (!cwd) {
+                    res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
+                    return;
+                }
+                const snapshot = structured.createSession({
+                    cwd,
+                    mode: parseExecutionMode(body.mode, defaultMode),
+                    provider: spec.provider,
+                    runner: spec.runner,
+                    worktreeEnabled: body.worktreeEnabled === true,
+                    [spec.nativeIdKey]: nativeId,
+                    workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
+                    ...parseSessionCreationOrigin(body),
+                });
+                onSessionCreated?.(cwd);
+                res.status(201).json({ resumedClaudeSessionId: nativeId, ...toDetailDTO(snapshot) });
+            }
+            catch (error) {
+                res.status(400).json({ error: getErrorMessage(error, `无法按 ${spec.label} 会话 ID 恢复会话。`) });
+            }
+        }));
+    }
+}

package/dist/server-session-routes.js

@@ -8,12 +8,14 @@ import { resolveSessionCwd } from "./session-cwd.js";
 import { resolveCommitAiContext } from "./session-ai-context.js";
 import { getGitStatusAsync, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
-import { buildProviderResumeCommand, isProviderSessionId, isSafeProviderSessionId } from "./resume-policy.js";
+import { buildProviderResumeCommand, isProviderSessionId } from "./resume-policy.js";
 import { parseBoundedInteger } from "./request-limits.js";
 import { asyncRoute } from "./express-async.js";
+import { sendRouteError } from "./server-request.js";
+import { registerStructuredResumeRoutes } from "./server-resume-routes.js";
 import { enrichStructuredMessages, WAND_PROTOCOL_VERSION } from "./structured-client-protocol.js";
 import { buildDirectoryTree, normalizeSessionDirectory, } from "./session-directory-tree.js";
-import { projectCwdForSession, resolveWorkspaceIdForNewSession, } from "./workspace-binding.js";
+import { projectCwdForSession, renameWorkspaceDirectory, resolveWorkspaceIdForNewSession, } from "./workspace-binding.js";
 export function parseExecutionMode(value, fallback) {
     if (value === undefined)
         return fallback;
@@ -426,7 +428,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(page);
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法加载会话列表。") });
+            sendRouteError(res, error, "无法加载会话列表。", 500);
         }
     });
     app.get("/api/session-directories", (_req, res) => {
@@ -434,7 +436,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(currentDirectoryTree());
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法加载会话目录。") });
+            sendRouteError(res, error, "无法加载会话目录。", 500);
         }
     });
     app.put("/api/session-directories/name", (req, res) => {
@@ -468,10 +470,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 return;
             }
             storage.setSessionDirectoryName(directoryPath, customName || null);
+            // 同一步把项目名改成同一个名字，避免「工作区」改名后只有会话目录视图生效。
+            renameWorkspaceDirectory(storage, directoryPath, customName);
             res.json({ ok: true, path: directoryPath, name: customName || null });
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法保存工作区名称。") });
+            sendRouteError(res, error, "无法保存工作区名称。", 500);
         }
     });
     app.get("/api/sessions", (_req, res) => {
@@ -514,7 +518,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(201).json(sessionResponseDTO(snapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法启动结构化会话。") });
+            sendRouteError(res, error, "无法启动结构化会话。");
         }
     }));
     app.post("/api/sessions/:id/model", (req, res) => {
@@ -530,7 +534,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(updated);
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "切换模型失败。") });
+            sendRouteError(res, error, "切换模型失败。");
         }
     });
     // 思考深度切换：与 /model 路由对称。结构化会话立即影响下一条 prompt（CLI/SDK 各自接入
@@ -548,7 +552,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(updated);
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "切换思考深度失败。") });
+            sendRouteError(res, error, "切换思考深度失败。");
         }
     });
     // 执行模式切换：与 /model、/thinking-effort 路由对称。结构化会话立即影响下一条
@@ -577,7 +581,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessions.setSessionMode(id, effective));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "切换模式失败。") });
+            sendRouteError(res, error, "切换模式失败。");
         }
     });
     app.get("/api/structured-sessions/:id/messages", (req, res) => {
@@ -638,7 +642,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法调整排队顺序。") });
+            sendRouteError(res, error, "无法调整排队顺序。");
         }
     });
     app.delete("/api/structured-sessions/:id/queued/:index", (req, res) => {
@@ -653,7 +657,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法删除排队消息。") });
+            sendRouteError(res, error, "无法删除排队消息。");
         }
     });
     app.post("/api/structured-sessions/:id/queued/:index/promote", asyncRoute(async (req, res) => {
@@ -683,7 +687,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法清空排队消息。") });
+            sendRouteError(res, error, "无法清空排队消息。");
         }
     });
     // ── Tool content lazy-load endpoint ──
@@ -830,7 +834,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(status).json({ error: error.message, errorCode: error.code });
                 return;
             }
-            res.status(400).json({ error: getErrorMessage(error, "快捷提交失败。") });
+            sendRouteError(res, error, "快捷提交失败。");
         }
     }));
     app.post("/api/sessions/:id/generate-commit-message", asyncRoute(async (req, res) => {
@@ -855,7 +859,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: error.message, errorCode: error.code });
                 return;
             }
-            res.status(400).json({ error: getErrorMessage(error, "生成 commit message 失败。") });
+            sendRouteError(res, error, "生成 commit message 失败。");
         }
     }));
     app.post("/api/sessions/:id/git/tag-head", asyncRoute(async (req, res) => {
@@ -887,7 +891,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(status).json({ error: error.message, errorCode: error.code });
                 return;
             }
-            res.status(400).json({ error: getErrorMessage(error, "打 tag 失败。") });
+            sendRouteError(res, error, "打 tag 失败。");
         }
     }));
     app.post("/api/sessions/:id/git/push", asyncRoute(async (req, res) => {
@@ -916,7 +920,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: error.message, errorCode: error.code });
                 return;
             }
-            res.status(400).json({ error: getErrorMessage(error, "推送失败。") });
+            sendRouteError(res, error, "推送失败。");
         }
     }));
     app.post("/api/sessions/:id/worktree/cleanup", asyncRoute(async (req, res) => {
@@ -1061,7 +1065,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(201).json(sessionResponseDTO(newSnapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
+            sendRouteError(res, error, "无法恢复会话。");
         }
     }));
     app.post("/api/claude-sessions/:claudeSessionId/resume", asyncRoute(async (req, res) => {
@@ -1131,7 +1135,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
+            sendRouteError(res, error, "无法按 Claude 会话 ID 恢复会话。");
         }
     }));
     app.post("/api/sessions/:id/input", asyncRoute(async (req, res) => {
@@ -1194,162 +1198,13 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(response.statusCode).json(response.payload);
         }
     }));
-    app.post("/api/codex-sessions/:threadId/resume", asyncRoute(async (req, res) => {
-        const threadId = String(req.params.threadId || "").trim();
-        const body = req.body;
-        try {
-            if (!isProviderSessionId(threadId)) {
-                res.status(400).json({ error: "Codex 会话 ID 必须是有效的 UUID。" });
-                return;
-            }
-            const history = processes.listCodexHistorySessions().find((s) => s.claudeSessionId === threadId);
-            if (!history) {
-                res.status(400).json({ error: "对应的 Codex 历史会话不存在，无法恢复。" });
-                return;
-            }
-            const cwd = body.cwd?.trim() || history.cwd;
-            if (!cwd) {
-                res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
-                return;
-            }
-            const newMode = parseExecutionMode(body.mode, defaultMode);
-            const origin = parseSessionCreationOrigin(body);
-            const snapshot = structured.createSession({
-                cwd,
-                mode: newMode,
-                provider: "codex",
-                runner: "codex-cli-exec",
-                worktreeEnabled: body.worktreeEnabled === true,
-                claudeSessionId: threadId,
-                workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
-                ...origin,
-            });
-            onSessionCreated?.(cwd);
-            res.status(201).json({ resumedClaudeSessionId: threadId, ...sessionResponseDTO(snapshot) });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 Codex 会话 ID 恢复会话。") });
-        }
-    }));
-    /**
-     * OpenCode and Qoder own their native transcript storage. Restoring an
-     * external transcript creates a Wand structured shell carrying the native
-     * ID; each provider runner adds its own resume flag when the next input is
-     * sent, preserving the original context without importing the full history.
-     */
-    app.post("/api/opencode-sessions/:sessionId/resume", (req, res) => {
-        const sessionId = String(req.params.sessionId || "").trim();
-        const body = req.body;
-        try {
-            if (!isSafeProviderSessionId(sessionId)) {
-                res.status(400).json({ error: "OpenCode 会话 ID 格式无效。" });
-                return;
-            }
-            const history = processes.listOpenCodeHistorySessions().find((session) => session.claudeSessionId === sessionId);
-            if (!history) {
-                res.status(400).json({ error: "对应的 OpenCode 历史会话不存在，无法恢复。" });
-                return;
-            }
-            const cwd = body.cwd?.trim() || history.cwd;
-            if (!cwd) {
-                res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
-                return;
-            }
-            const snapshot = structured.createSession({
-                cwd,
-                mode: parseExecutionMode(body.mode, defaultMode),
-                provider: "opencode",
-                runner: "opencode-cli-run",
-                worktreeEnabled: body.worktreeEnabled === true,
-                claudeSessionId: sessionId,
-                workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
-                ...parseSessionCreationOrigin(body),
-            });
-            onSessionCreated?.(cwd);
-            res.status(201).json({ resumedClaudeSessionId: sessionId, ...sessionResponseDTO(snapshot) });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 OpenCode 会话 ID 恢复会话。") });
-        }
-    });
-    app.post("/api/qoder-sessions/:sessionId/resume", (req, res) => {
-        const sessionId = String(req.params.sessionId || "").trim();
-        const body = req.body;
-        try {
-            if (!isSafeProviderSessionId(sessionId)) {
-                res.status(400).json({ error: "Qoder 会话 ID 格式无效。" });
-                return;
-            }
-            const history = processes.listQoderHistorySessions().find((session) => session.claudeSessionId === sessionId);
-            if (!history) {
-                res.status(400).json({ error: "对应的 Qoder 历史会话不存在，无法恢复。" });
-                return;
-            }
-            const cwd = body.cwd?.trim() || history.cwd;
-            if (!cwd) {
-                res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
-                return;
-            }
-            const snapshot = structured.createSession({
-                cwd,
-                mode: parseExecutionMode(body.mode, defaultMode),
-                provider: "qoder",
-                runner: "qoder-cli-print",
-                worktreeEnabled: body.worktreeEnabled === true,
-                claudeSessionId: sessionId,
-                workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
-                ...parseSessionCreationOrigin(body),
-            });
-            onSessionCreated?.(cwd);
-            res.status(201).json({ resumedClaudeSessionId: sessionId, ...sessionResponseDTO(snapshot) });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 Qoder 会话 ID 恢复会话。") });
-        }
-    });
-    const resumeNamedStructuredSession = (req, res, spec) => {
-        const sessionId = String(req.params.sessionId || "").trim();
-        const body = req.body;
-        try {
-            if (!isSafeProviderSessionId(sessionId)) {
-                res.status(400).json({ error: `${spec.label} 会话 ID 格式无效。` });
-                return;
-            }
-            const cwd = body.cwd?.trim();
-            if (!cwd) {
-                res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
-                return;
-            }
-            const snapshot = structured.createSession({
-                cwd,
-                mode: parseExecutionMode(body.mode, defaultMode),
-                provider: spec.provider,
-                runner: spec.runner,
-                worktreeEnabled: body.worktreeEnabled === true,
-                claudeSessionId: sessionId,
-                workspaceId: resolveWorkspaceIdForNewSession(storage, cwd),
-                ...parseSessionCreationOrigin(body),
-            });
-            onSessionCreated?.(cwd);
-            res.status(201).json({ resumedClaudeSessionId: sessionId, ...sessionResponseDTO(snapshot) });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, `无法按 ${spec.label} 会话 ID 恢复会话。`) });
-        }
-    };
-    app.post("/api/grok-sessions/:sessionId/resume", (req, res) => {
-        resumeNamedStructuredSession(req, res, {
-            provider: "grok",
-            runner: "grok-cli-headless",
-            label: "Grok",
-        });
-    });
-    app.post("/api/pi-sessions/:sessionId/resume", (req, res) => {
-        resumeNamedStructuredSession(req, res, {
-            provider: "pi",
-            runner: "pi-cli-json",
-            label: "Pi",
-        });
+    registerStructuredResumeRoutes(app, {
+        processes,
+        structured,
+        storage,
+        defaultMode,
+        onSessionCreated,
+        toDetailDTO: sessionResponseDTO,
     });
     app.post("/api/sessions/:id/resize", (req, res) => {
         const body = req.body;
@@ -1362,7 +1217,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法调整终端大小。") });
+            sendRouteError(res, error, "无法调整终端大小。");
         }
     });
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
@@ -1379,7 +1234,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(processes.approvePermission(req.params.id)));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法批准该授权请求。") });
+            sendRouteError(res, error, "无法批准该授权请求。");
         }
     });
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
@@ -1396,7 +1251,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(processes.denyPermission(req.params.id)));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法拒绝该授权请求。") });
+            sendRouteError(res, error, "无法拒绝该授权请求。");
         }
     });
     app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
@@ -1413,7 +1268,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(processes.toggleAutoApprove(req.params.id)));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法切换自动批准状态。") });
+            sendRouteError(res, error, "无法切换自动批准状态。");
         }
     });
     app.post("/api/sessions/:id/escalations/:requestId/resolve", (req, res) => {
@@ -1432,7 +1287,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(processes.resolveEscalation(req.params.id, requestId, resolution)));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法处理该授权请求。") });
+            sendRouteError(res, error, "无法处理该授权请求。");
         }
     });
     app.post("/api/sessions/:id/stop", (req, res) => {
@@ -1444,7 +1299,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json(sessionResponseDTO(processes.stop(req.params.id)));
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法停止会话。") });
+            sendRouteError(res, error, "无法停止会话。");
         }
     });
     app.delete("/api/sessions/:id", (req, res) => {
@@ -1453,7 +1308,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json({ ok: true });
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法删除会话。") });
+            sendRouteError(res, error, "无法删除会话。");
         }
     });
 }
@@ -1547,7 +1402,7 @@ export function registerClaudeHistoryRoutes(app, processes, storage) {
             res.json({ ok: true, deleted });
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法删除该目录下的历史会话。") });
+            sendRouteError(res, error, "无法删除该目录下的历史会话。", 500);
         }
     });
     registerHistoryMutations("codex", "threadId", "Codex");

package/dist/server-settings-routes.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { buildChildEnv } from "./env-utils.js";
 import { getErrorMessage } from "./error-utils.js";
 import { asyncRoute } from "./express-async.js";
+import { sendRouteError } from "./server-request.js";
 import { getProviderDefaultModels, PREFERENCE_KEYS, saveConfig, validateCommitAiConfig, writePreferenceToStorage, } from "./config.js";
 import { DEPLOYMENT_CONFIG_KEYS } from "./runtime-config.js";
 import { callSystemAiText, discoverCliSystemAiConfigs, mergeSystemAiConfigs, normalizeSystemAiConfig, } from "./system-ai.js";
@@ -203,7 +204,7 @@ export function registerSettingsRoutes(app, deps) {
             }
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "测试线路配置无效。") });
+            sendRouteError(res, error, "测试线路配置无效。");
             return;
         }
         const startedAt = Date.now();
@@ -352,7 +353,7 @@ export function registerSettingsRoutes(app, deps) {
             validateCommitAiConfig(candidateConfig);
         }
         catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "配置校验失败。") });
+            sendRouteError(res, error, "配置校验失败。");
             return;
         }
         if (!touchedDeployField && stagedPreferences.length === 0) {
@@ -387,7 +388,7 @@ export function registerSettingsRoutes(app, deps) {
                 }
                 catch { /* preserve original */ }
             }
-            res.status(500).json({ error: getErrorMessage(error, "保存配置失败。") });
+            sendRouteError(res, error, "保存配置失败。", 500);
         }
     }));
     app.get("/api/models", (_req, res) => {
@@ -423,7 +424,7 @@ export function registerSettingsRoutes(app, deps) {
             });
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "刷新模型列表失败。") });
+            sendRouteError(res, error, "刷新模型列表失败。", 500);
         }
     }));
     app.post("/api/settings/upload-cert", requireAdmin, asyncRoute(async (req, res) => {
@@ -442,7 +443,7 @@ export function registerSettingsRoutes(app, deps) {
             res.json({ ok: true, restartRequired: true });
         }
         catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "保存证书失败。") });
+            sendRouteError(res, error, "保存证书失败。", 500);
         }
     }));
 }