@co0ontty/wand 3.1.1 → 4.0.0

package/dist/server-session-routes.js

@@ -1,11 +1,23 @@
 import { SessionInputError } from "./process-manager.js";
-import { getDefaultModelForProvider, normalizeMode } from "./config.js";
+import { getDefaultModelForProvider, isExecutionMode } from "./config.js";
 import { blockWindowMessagesForTransport, sliceTurnBlocksForTransport, truncateMessagesForTransport, windowMessagesForTransport } from "./message-truncator.js";
-import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
+import { toSessionDetailDTO, toSessionListItemDTO } from "./session-transport.js";
+import { checkSessionWorktreeMergeabilityAsync, cleanupSessionWorktreeAsync, getWorktreeMergeErrorCode, mergeSessionWorktreeAsync, WorktreeMergeError, } from "./git-worktree.js";
 import { resolveSessionCwd } from "./session-cwd.js";
 import { resolveCommitAiContext } from "./session-ai-context.js";
-import { getGitStatus, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
+import { getGitStatusAsync, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
+import { isProviderSessionId } from "./resume-policy.js";
+import { parseBoundedInteger } from "./request-limits.js";
+import { asyncRoute } from "./express-async.js";
+export function parseExecutionMode(value, fallback) {
+    if (value === undefined)
+        return fallback;
+    if (!isExecutionMode(value)) {
+        throw new Error(`无效执行模式: ${String(value)}`);
+    }
+    return value;
+}
 export function parseSessionCreationOrigin(body) {
     const rawSource = body?.sessionSource;
     if (rawSource !== undefined && rawSource !== "interactive" && rawSource !== "automation" && rawSource !== "startup") {
@@ -115,9 +127,6 @@ function removeFromHiddenClaudeSessionIds(storage, ids) {
         saveHiddenClaudeSessionIds(storage, hidden);
     }
 }
-function getSessionById(processes, structured, id) {
-    return structured.get(id) ?? processes.get(id);
-}
 /**
  * A Wand-managed session and its provider-native history represent the same
  * conversation. Delete both in one operation so the native history cannot
@@ -157,10 +166,26 @@ export function deleteSessionWithProviderHistory(processes, structured, storage,
     // Keep a tombstone as a fallback for permission errors or process tail writes.
     addToHiddenClaudeSessionIds(storage, [providerSessionId]);
 }
-/** Lightweight session list — omits output and messages to reduce payload. */
-function listAllSessionsSlim(processes, structured) {
-    return [...structured.listSlim(), ...processes.listSlim()]
-        .sort((a, b) => b.startedAt.localeCompare(a.startedAt));
+/**
+ * Provider history is scanned by ProcessManager, but structured sessions live
+ * in StructuredSessionManager. Annotate against the combined session list so a
+ * structured conversation is not also exposed as a recoverable native history
+ * entry. Return copies for matches because ProcessManager caches scan results.
+ */
+export function markManagedProviderHistory(history, sessions, provider) {
+    const managedIds = new Set();
+    for (const session of sessions) {
+        const sessionProvider = session.provider
+            ?? session.structuredState?.provider
+            ?? (/^codex\b/i.test(session.command.trim()) ? "codex" : "claude");
+        const providerSessionId = session.claudeSessionId?.trim();
+        if (sessionProvider === provider && providerSessionId) {
+            managedIds.add(providerSessionId);
+        }
+    }
+    return history.map((entry) => (entry.managedByWand || !managedIds.has(entry.claudeSessionId)
+        ? entry
+        : { ...entry, managedByWand: true }));
 }
 function requireWorktreeSession(snapshot) {
     if (!snapshot) {
@@ -179,15 +204,14 @@ function buildWorktreeMergeInfo(current, info) {
         conflict: info?.conflict,
     };
 }
-function saveWorktreeMergeState(storage, current, status, info) {
+function saveWorktreeMergeState(sessions, current, status, info) {
     const mergedInfo = buildWorktreeMergeInfo(current, info);
     const updated = {
         ...current,
         worktreeMergeStatus: status,
         worktreeMergeInfo: mergedInfo,
     };
-    storage.saveSessionMetadata(updated);
-    return updated;
+    return sessions.updateWorktreeState(current.id, status, mergedInfo) ?? updated;
 }
 function getWorktreeMergeResponseStatus(error) {
     return getWorktreeMergeErrorCode(error) === "WORKTREE_MERGE_CONFLICT" ? 409 : 400;
@@ -206,9 +230,6 @@ function getWorktreeMergePayload(error, fallback) {
         result: null,
     };
 }
-function getLatestSessionSnapshot(processes, structured, storage, id) {
-    return getSessionById(processes, structured, id) ?? storage.getSession(id);
-}
 function buildCodexResumeCommand(command, threadId) {
     const trimmed = command.trim();
     const withoutExistingResume = trimmed
@@ -244,7 +265,7 @@ function startResumedPtySession(processes, existingSession, sessionId, defaultMo
             throw new Error("对应的 Codex 历史会话不存在，无法恢复。");
         }
     }
-    const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
+    const newMode = parseExecutionMode(body.mode, parseExecutionMode(existingSession.mode, defaultMode));
     const resumeCommand = provider === "codex"
         ? buildCodexResumeCommand(command, resumeSessionId)
         : `${command} --resume ${resumeSessionId}`;
@@ -288,12 +309,19 @@ function canMergeSession(snapshot) {
 function isMergeActionAllowed(snapshot) {
     return snapshot.status !== "running";
 }
-export function registerSessionRoutes(app, processes, structured, storage, defaultMode, config, onSessionCreated) {
+export function registerSessionRoutes(app, processes, structured, storage, defaultMode, config, sessions, onSessionCreated) {
+    const sessionResponseDTO = (snapshot) => {
+        const windowed = windowMessagesForTransport(snapshot.messages ?? [], config.cardDefaults ?? {});
+        return toSessionDetailDTO(snapshot, {
+            messages: windowed.messages,
+            messageOffset: windowed.messageOffset,
+            messageTotal: windowed.messageTotal,
+        });
+    };
     app.get("/api/sessions", (_req, res) => {
-        const all = listAllSessionsSlim(processes, structured);
-        res.json(all);
+        res.json(sessions.listSlim().map(toSessionListItemDTO));
     });
-    app.post("/api/structured-sessions", async (req, res) => {
+    app.post("/api/structured-sessions", asyncRoute(async (req, res) => {
         const body = req.body;
         try {
             if (body.provider && body.provider !== "claude" && body.provider !== "codex" && body.provider !== "opencode") {
@@ -305,9 +333,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             const origin = parseSessionCreationOrigin(body);
             const snapshot = structured.createSession({
                 cwd: resolveSessionCwd(body.cwd, config.defaultCwd),
-                mode: normalizeMode(body.mode, defaultMode),
+                mode: parseExecutionMode(body.mode, defaultMode),
                 provider,
-                runner: body.runner ?? (provider === "codex" ? "codex-cli-exec" : provider === "opencode" ? "opencode-cli-run" : "claude-cli-print"),
+                // Omit runner to let StructuredSessionManager apply the configured
+                // Claude default; explicit values are validated against the provider.
+                runner: body.runner,
                 worktreeEnabled: body.worktreeEnabled === true,
                 model: rawModel || getDefaultModelForProvider(config, provider) || undefined,
                 thinkingEffort: typeof body.thinkingEffort === "string"
@@ -322,29 +352,22 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(201).json(finished);
                 return;
             }
-            res.status(201).json(snapshot);
+            res.status(201).json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法启动结构化会话。") });
         }
-    });
+    }));
     app.post("/api/sessions/:id/model", (req, res) => {
         const body = req.body;
         const rawModel = typeof body?.model === "string" ? body.model.trim() : null;
         const id = req.params.id;
         try {
-            const structuredSnapshot = structured.get(id);
-            if (structuredSnapshot) {
-                const updated = structured.setSessionModel(id, rawModel);
-                res.json(updated);
-                return;
-            }
-            const ptySnapshot = processes.get(id);
-            if (!ptySnapshot) {
+            const updated = sessions.setSessionModel(id, rawModel);
+            if (!updated) {
                 res.status(404).json({ error: "未找到该会话。" });
                 return;
             }
-            const updated = processes.setSessionModel(id, rawModel);
             res.json(updated);
         }
         catch (error) {
@@ -358,16 +381,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const raw = typeof body?.thinkingEffort === "string" ? body.thinkingEffort : null;
         const id = req.params.id;
         try {
-            if (structured.get(id)) {
-                const updated = structured.setSessionThinkingEffort(id, raw);
-                res.json(updated);
-                return;
-            }
-            if (!processes.get(id)) {
+            const updated = sessions.setSessionThinkingEffort(id, raw);
+            if (!updated) {
                 res.status(404).json({ error: "未找到该会话。" });
                 return;
             }
-            const updated = processes.setSessionThinkingEffort(id, raw);
             res.json(updated);
         }
         catch (error) {
@@ -384,23 +402,20 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(400).json({ error: "缺少 mode。" });
             return;
         }
-        const mode = normalizeMode(raw, "managed");
+        if (!isExecutionMode(raw)) {
+            res.status(400).json({ error: `无效执行模式: ${raw}` });
+            return;
+        }
+        const mode = raw;
         const id = req.params.id;
         try {
-            const structuredSnapshot = structured.get(id);
-            if (structuredSnapshot) {
-                const provider = structuredSnapshot.provider ?? "claude";
-                const effective = provider === "codex" ? "full-access" : mode;
-                res.json(structured.setSessionMode(id, effective));
-                return;
-            }
-            const ptySnapshot = processes.get(id);
-            if (!ptySnapshot) {
+            const snapshot = sessions.get(id);
+            if (!snapshot) {
                 res.status(404).json({ error: "未找到该会话。" });
                 return;
             }
-            const effective = (ptySnapshot.provider ?? "claude") === "codex" ? "full-access" : mode;
-            res.json(processes.setSessionMode(id, effective));
+            const effective = (snapshot.provider ?? "claude") === "codex" ? "full-access" : mode;
+            res.json(sessions.setSessionMode(id, effective));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "切换模式失败。") });
@@ -414,7 +429,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         res.json({ id: snapshot.id, messages: snapshot.messages ?? [] });
     });
-    app.post("/api/structured-sessions/:id/messages", async (req, res) => {
+    app.post("/api/structured-sessions/:id/messages", asyncRoute(async (req, res) => {
         const input = String(req.body?.input ?? "");
         const interrupt = !!req.body?.interrupt;
         // preserveQueue: 仅在 interrupt 路径有意义。排队条「立即」会带这个 flag，
@@ -423,7 +438,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.sendMessage(req.params.id, input, { interrupt, preserveQueue, idempotencyKey });
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             const errorCode = error?.code;
@@ -433,7 +448,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 errorCode,
             });
         }
-    });
+    }));
     // ── Structured queued-messages management ──
     // 这些端点构成"排队消息条"的后端操作面：reorder、立即发送、单条删除、全部清空。
     // 全部走乐观更新模型，失败时前端会回滚到上一次 WS 推送的 queuedMessages。
@@ -445,7 +460,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         try {
             const snapshot = structured.reorderQueuedMessages(req.params.id, rawOrder.map((v) => Number(v)));
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法调整排队顺序。") });
@@ -459,13 +474,13 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         try {
             const snapshot = structured.deleteQueuedMessage(req.params.id, index);
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法删除排队消息。") });
         }
     });
-    app.post("/api/structured-sessions/:id/queued/:index/promote", async (req, res) => {
+    app.post("/api/structured-sessions/:id/queued/:index/promote", asyncRoute(async (req, res) => {
         const index = Number(req.params.index);
         if (!Number.isInteger(index)) {
             res.status(400).json({ error: "下标无效。" });
@@ -475,7 +490,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(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             const errorCode = error?.code;
@@ -485,11 +500,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 errorCode,
             });
         }
-    });
+    }));
     app.delete("/api/structured-sessions/:id/queued", (req, res) => {
         try {
             const snapshot = structured.clearQueuedMessages(req.params.id);
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法清空排队消息。") });
@@ -497,7 +512,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     // ── Tool content lazy-load endpoint ──
     app.get("/api/sessions/:id/tool-content/:toolUseId", (req, res) => {
-        const snapshot = getSessionById(processes, structured, req.params.id);
+        const snapshot = sessions.get(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -518,25 +533,25 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         res.status(404).json({ error: "未找到该工具结果。" });
     });
-    app.post("/api/sessions/:id/worktree/merge/check", (req, res) => {
+    app.post("/api/sessions/:id/worktree/merge/check", asyncRoute(async (req, res) => {
         try {
-            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            const current = requireWorktreeSession(sessions.getLatest(req.params.id));
             if (!isMergeActionAllowed(current)) {
                 res.status(409).json({ error: "会话仍在运行，请结束后再合并。", errorCode: "SESSION_STILL_RUNNING" });
                 return;
             }
-            const checking = saveWorktreeMergeState(storage, current, "checking", {
+            const checking = saveWorktreeMergeState(sessions, current, "checking", {
                 ...(current.worktreeMergeInfo ?? null),
                 targetBranch: current.worktreeMergeInfo?.targetBranch,
                 lastError: undefined,
                 conflict: false,
             });
-            const result = checkSessionWorktreeMergeability({
+            const result = await checkSessionWorktreeMergeabilityAsync({
                 worktree: checking.worktree,
                 targetBranch: current.worktreeMergeInfo?.targetBranch,
             });
             const nextStatus = result.ok ? "ready" : "failed";
-            const updated = saveWorktreeMergeState(storage, checking, nextStatus, {
+            const updated = saveWorktreeMergeState(sessions, checking, nextStatus, {
                 targetBranch: result.targetBranch,
                 conflict: result.hasConflicts,
                 lastError: result.ok ? undefined : result.reason,
@@ -546,24 +561,24 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         catch (error) {
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法检查 worktree 合并状态。"));
         }
-    });
-    app.post("/api/sessions/:id/worktree/merge", (req, res) => {
+    }));
+    app.post("/api/sessions/:id/worktree/merge", asyncRoute(async (req, res) => {
         try {
-            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            const current = requireWorktreeSession(sessions.getLatest(req.params.id));
             if (!isMergeActionAllowed(current)) {
                 res.status(409).json({ error: "会话仍在运行，请结束后再合并。", errorCode: "SESSION_STILL_RUNNING" });
                 return;
             }
-            const merging = saveWorktreeMergeState(storage, current, "merging", {
+            const merging = saveWorktreeMergeState(sessions, current, "merging", {
                 ...(current.worktreeMergeInfo ?? null),
                 lastError: undefined,
                 conflict: false,
             });
-            const result = mergeSessionWorktree({
+            const result = await mergeSessionWorktreeAsync({
                 worktree: merging.worktree,
                 targetBranch: current.worktreeMergeInfo?.targetBranch,
             });
-            const updated = saveWorktreeMergeState(storage, merging, "merged", {
+            const updated = saveWorktreeMergeState(sessions, merging, "merged", {
                 targetBranch: result.targetBranch,
                 mergedAt: result.mergedAt,
                 mergeCommit: result.mergeCommit,
@@ -574,10 +589,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.json({ session: updated, result });
         }
         catch (error) {
-            const current = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+            const current = sessions.getLatest(req.params.id);
             if (current && canMergeSession(current)) {
                 const payload = getWorktreeMergePayload(error, "无法合并 worktree。");
-                saveWorktreeMergeState(storage, current, "failed", {
+                saveWorktreeMergeState(sessions, current, "failed", {
                     ...(current.worktreeMergeInfo ?? null),
                     targetBranch: payload.result?.targetBranch ?? current.worktreeMergeInfo?.targetBranch,
                     mergedAt: payload.result?.mergedAt,
@@ -589,9 +604,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法合并 worktree。"));
         }
-    });
-    app.get("/api/sessions/:id/git-status", (req, res) => {
-        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+    }));
+    app.get("/api/sessions/:id/git-status", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -601,14 +616,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             return;
         }
         try {
-            res.json(getGitStatus(snapshot.cwd));
+            res.json(await getGitStatusAsync(snapshot.cwd));
         }
         catch (error) {
             res.json({ isGit: false, error: getErrorMessage(error, "无法读取 git 状态。") });
         }
-    });
-    app.post("/api/sessions/:id/quick-commit", async (req, res) => {
-        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+    }));
+    app.post("/api/sessions/:id/quick-commit", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -641,9 +656,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             res.status(400).json({ error: getErrorMessage(error, "快捷提交失败。") });
         }
-    });
-    app.post("/api/sessions/:id/generate-commit-message", async (req, res) => {
-        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+    }));
+    app.post("/api/sessions/:id/generate-commit-message", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -666,9 +681,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             res.status(400).json({ error: getErrorMessage(error, "生成 commit message 失败。") });
         }
-    });
-    app.post("/api/sessions/:id/git/tag-head", async (req, res) => {
-        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+    }));
+    app.post("/api/sessions/:id/git/tag-head", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -698,9 +713,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             res.status(400).json({ error: getErrorMessage(error, "打 tag 失败。") });
         }
-    });
-    app.post("/api/sessions/:id/git/push", async (req, res) => {
-        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+    }));
+    app.post("/api/sessions/:id/git/push", asyncRoute(async (req, res) => {
+        const snapshot = sessions.getLatest(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话。" });
             return;
@@ -727,16 +742,16 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             res.status(400).json({ error: getErrorMessage(error, "推送失败。") });
         }
-    });
-    app.post("/api/sessions/:id/worktree/cleanup", (req, res) => {
+    }));
+    app.post("/api/sessions/:id/worktree/cleanup", asyncRoute(async (req, res) => {
         try {
-            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            const current = requireWorktreeSession(sessions.getLatest(req.params.id));
             if (current.worktreeMergeStatus !== "merged" || current.worktreeMergeInfo?.cleanupDone !== false) {
                 res.status(400).json({ error: "当前 worktree 无需补偿清理。", errorCode: "WORKTREE_CLEANUP_NOT_NEEDED" });
                 return;
             }
-            cleanupSessionWorktree({ worktree: current.worktree });
-            const updated = saveWorktreeMergeState(storage, current, "merged", {
+            await cleanupSessionWorktreeAsync({ worktree: current.worktree });
+            const updated = saveWorktreeMergeState(sessions, current, "merged", {
                 ...(current.worktreeMergeInfo ?? null),
                 cleanupDone: true,
                 lastError: undefined,
@@ -747,7 +762,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         catch (error) {
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法清理 worktree。"));
         }
-    });
+    }));
     app.post("/api/sessions/batch-delete", (req, res) => {
         const sessionIds = Array.isArray(req.body?.sessionIds)
             ? req.body.sessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)
@@ -760,7 +775,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const failed = [];
         for (const sessionId of sessionIds) {
             try {
-                deleteSessionWithProviderHistory(processes, structured, storage, sessionId);
+                sessions.deleteWithProviderHistory(sessionId);
                 deleted += 1;
             }
             catch {
@@ -774,7 +789,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         res.json({ ok: true, deleted, failed });
     });
     app.get("/api/sessions/:id", (req, res) => {
-        const snapshot = getSessionById(processes, structured, req.params.id);
+        const snapshot = sessions.get(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
@@ -785,38 +800,37 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         if (req.query.format === "chat") {
             // 客户端带 blockBudget（iOS）走块级窗口：只回最近 N 个块（必要时切掉最旧 turn 的头部），
             // 根治「单条 turn 上百块/1MB」的长任务打开慢。Web/Android 不带该参数，走原 turn 级窗口。
-            const rawBudget = parseInt(String(req.query.blockBudget ?? ""), 10);
-            if (Number.isFinite(rawBudget) && rawBudget > 0) {
-                const windowed = blockWindowMessagesForTransport(snapshot.messages ?? [], config.cardDefaults ?? {}, rawBudget);
-                res.json({
-                    ...snapshot,
+            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(snapshot.messages ?? [], config.cardDefaults ?? {}, blockBudget);
+                res.json(toSessionDetailDTO(snapshot, {
                     output: transcriptOutput,
                     messages: windowed.messages,
                     messageOffset: windowed.messageOffset,
                     messageTotal: windowed.messageTotal,
                     leadingBlockOffset: windowed.leadingBlockOffset,
                     leadingBlockTotal: windowed.leadingBlockTotal,
-                });
+                }));
                 return;
             }
             // 与 WS init 对齐：只回最近一窗 turn + offset/total，更早的走 /messages 翻页。
             const windowed = windowMessagesForTransport(snapshot.messages ?? [], config.cardDefaults ?? {});
-            res.json({
-                ...snapshot,
+            res.json(toSessionDetailDTO(snapshot, {
                 output: transcriptOutput,
                 messages: windowed.messages,
                 messageOffset: windowed.messageOffset,
                 messageTotal: windowed.messageTotal,
-            });
+            }));
         }
         else {
-            res.json({ ...snapshot, output: transcriptOutput });
+            res.json(toSessionDetailDTO(snapshot, { output: transcriptOutput }));
         }
     });
     // 历史消息分页拉取：客户端滚动到顶时按绝对下标往前翻。
     // 返回 messages = 完整历史的 [offset, offset+limit)（已做 transport 截断）+ total。
     app.get("/api/sessions/:id/messages", (req, res) => {
-        const snapshot = getSessionById(processes, structured, req.params.id);
+        const snapshot = sessions.get(req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
@@ -878,8 +892,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             const requestedOrigin = body.sessionSource !== undefined || body.automationId !== undefined
                 ? parseSessionCreationOrigin(body)
                 : null;
-            if (!claudeSessionId) {
-                res.status(400).json({ error: "Claude 会话 ID 不能为空。" });
+            if (!isProviderSessionId(claudeSessionId)) {
+                res.status(400).json({ error: "Claude 会话 ID 必须是有效的 UUID。" });
                 return;
             }
             const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
@@ -901,8 +915,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     res.status(400).json({ error: "对应的 Claude 历史会话文件不存在，无法恢复。" });
                     return;
                 }
-                const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
-                const resumeCommand = `${command} --resume ${claudeSessionId}`;
+                const newMode = parseExecutionMode(body.mode, parseExecutionMode(existingSession.mode, defaultMode));
+                // Do not reuse the persisted shell command here. It may contain flags or
+                // shell operators and must never become part of a resume command.
+                const resumeCommand = `claude --resume ${claudeSessionId}`;
                 const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
                 const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
                 const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, {
@@ -911,7 +927,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     rows: reqRows,
                     ...(requestedOrigin ?? {}),
                 });
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot) });
             }
             else {
                 const cwd = body.cwd?.trim();
@@ -919,7 +935,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     res.status(400).json({ error: "未找到对应的会话记录，请提供工作目录 (cwd)。" });
                     return;
                 }
-                const newMode = normalizeMode(body.mode, defaultMode);
+                const newMode = parseExecutionMode(body.mode, defaultMode);
                 const resumeCommand = `claude --resume ${claudeSessionId}`;
                 const reqCols = typeof body.cols === "number" && Number.isFinite(body.cols) ? body.cols : undefined;
                 const reqRows = typeof body.rows === "number" && Number.isFinite(body.rows) ? body.rows : undefined;
@@ -928,14 +944,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     rows: reqRows,
                     ...(requestedOrigin ?? {}),
                 });
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...sessionResponseDTO(newSnapshot) });
             }
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
         }
     });
-    app.post("/api/sessions/:id/input", async (req, res) => {
+    app.post("/api/sessions/:id/input", asyncRoute(async (req, res) => {
         const body = req.body;
         const sessionId = req.params.id;
         const input = body.input ?? "";
@@ -944,18 +960,18 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         try {
             if (structured.get(sessionId)) {
                 const snapshot = await structured.sendMessage(sessionId, input);
-                res.json(snapshot);
+                res.json(sessionResponseDTO(snapshot));
                 return;
             }
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
             const autoResumeInput = getAutoResumeInitialInput(existingSession, input, view, shortcutKey);
             if (autoResumeInput !== null && canAutoResumePtyForInput(existingSession, autoResumeInput)) {
                 const snapshot = startResumedPtySession(processes, existingSession, sessionId, defaultMode, {}, autoResumeInput);
-                res.json(snapshot);
+                res.json(sessionResponseDTO(snapshot));
                 return;
             }
             const snapshot = processes.sendInput(sessionId, input, view, shortcutKey);
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             const response = getInputErrorResponse(error, sessionId);
@@ -966,13 +982,13 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             });
             res.status(response.statusCode).json(response.payload);
         }
-    });
-    app.post("/api/codex-sessions/:threadId/resume", async (req, res) => {
+    }));
+    app.post("/api/codex-sessions/:threadId/resume", asyncRoute(async (req, res) => {
         const threadId = String(req.params.threadId || "").trim();
         const body = req.body;
         try {
-            if (!threadId) {
-                res.status(400).json({ error: "Codex 会话 ID 不能为空。" });
+            if (!isProviderSessionId(threadId)) {
+                res.status(400).json({ error: "Codex 会话 ID 必须是有效的 UUID。" });
                 return;
             }
             const history = processes.listCodexHistorySessions().find((s) => s.claudeSessionId === threadId);
@@ -985,7 +1001,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "无法确定工作目录 (cwd)，无法恢复。" });
                 return;
             }
-            const newMode = normalizeMode(body.mode, defaultMode);
+            const newMode = parseExecutionMode(body.mode, defaultMode);
             const origin = parseSessionCreationOrigin(body);
             const snapshot = structured.createSession({
                 cwd,
@@ -997,21 +1013,21 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 ...origin,
             });
             onSessionCreated?.(cwd);
-            res.status(201).json({ resumedClaudeSessionId: threadId, ...snapshot });
+            res.status(201).json({ resumedClaudeSessionId: threadId, ...sessionResponseDTO(snapshot) });
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法按 Codex 会话 ID 恢复会话。") });
         }
-    });
+    }));
     app.post("/api/sessions/:id/resize", (req, res) => {
         const body = req.body;
         try {
-            if (structured.get(req.params.id)) {
+            if (sessions.ownerOf(req.params.id) === "structured") {
                 res.status(400).json({ error: "结构化会话不支持调整终端大小。" });
                 return;
             }
             const snapshot = processes.resize(req.params.id, body.cols ?? 0, body.rows ?? 0);
-            res.json(snapshot);
+            res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法调整终端大小。") });
@@ -1019,11 +1035,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
         try {
-            if (structured.get(req.params.id)) {
+            if (sessions.ownerOf(req.params.id) === "structured") {
                 res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
                 return;
             }
-            const snapshot = processes.get(req.params.id);
+            const snapshot = sessions.get(req.params.id);
             if (snapshot?.provider === "codex") {
                 res.status(400).json({ error: "Codex provider 不支持权限批准操作。" });
                 return;
@@ -1036,11 +1052,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
         try {
-            if (structured.get(req.params.id)) {
+            if (sessions.ownerOf(req.params.id) === "structured") {
                 res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
                 return;
             }
-            const snapshot = processes.get(req.params.id);
+            const snapshot = sessions.get(req.params.id);
             if (snapshot?.provider === "codex") {
                 res.status(400).json({ error: "Codex provider 不支持权限拒绝操作。" });
                 return;
@@ -1053,11 +1069,11 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
         try {
-            if (structured.get(req.params.id)) {
+            if (sessions.ownerOf(req.params.id) === "structured") {
                 res.status(400).json({ error: "结构化会话不需要切换终端自动批准。" });
                 return;
             }
-            const snapshot = processes.get(req.params.id);
+            const snapshot = sessions.get(req.params.id);
             if (snapshot?.provider === "codex") {
                 res.status(400).json({ error: "Codex provider 不支持自动批准切换。" });
                 return;
@@ -1072,11 +1088,16 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         try {
             const { requestId } = req.params;
             const body = req.body;
-            if (structured.get(req.params.id)) {
-                res.json(structured.resolveEscalation(req.params.id, requestId, body.resolution));
+            const resolution = body?.resolution;
+            if (resolution !== "approve_once" && resolution !== "approve_turn" && resolution !== "deny") {
+                res.status(400).json({ error: "resolution 必须是 approve_once、approve_turn 或 deny。" });
+                return;
+            }
+            if (sessions.ownerOf(req.params.id) === "structured") {
+                res.json(structured.resolveEscalation(req.params.id, requestId, resolution));
                 return;
             }
-            res.json(processes.resolveEscalation(req.params.id, requestId, body.resolution));
+            res.json(processes.resolveEscalation(req.params.id, requestId, resolution));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法处理该授权请求。") });
@@ -1084,7 +1105,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/sessions/:id/stop", (req, res) => {
         try {
-            if (structured.get(req.params.id)) {
+            if (sessions.ownerOf(req.params.id) === "structured") {
                 res.json(structured.stop(req.params.id));
                 return;
             }
@@ -1096,7 +1117,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.delete("/api/sessions/:id", (req, res) => {
         try {
-            deleteSessionWithProviderHistory(processes, structured, storage, req.params.id);
+            sessions.deleteWithProviderHistory(req.params.id);
             res.json({ ok: true });
         }
         catch (error) {
@@ -1104,14 +1125,14 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
     });
 }
-export function registerClaudeHistoryRoutes(app, processes, storage) {
+export function registerClaudeHistoryRoutes(app, processes, structured, storage, sessionRegistry) {
     app.get("/api/claude-history", (_req, res) => {
         try {
-            const sessions = processes.listClaudeHistorySessions();
+            const history = markManagedProviderHistory(processes.listClaudeHistorySessions(), sessionRegistry.listSlim(), "claude");
             const hidden = getHiddenClaudeSessionIds(storage);
             const filtered = hidden.size > 0
-                ? sessions.filter((s) => !s.claudeSessionId || !hidden.has(s.claudeSessionId))
-                : sessions;
+                ? history.filter((s) => !s.claudeSessionId || !hidden.has(s.claudeSessionId))
+                : history;
             res.json(filtered);
         }
         catch (error) {
@@ -1212,11 +1233,11 @@ export function registerClaudeHistoryRoutes(app, processes, storage) {
     // hidden 集合与 claude 共用（id 全局唯一，不会冲突）。
     app.get("/api/codex-history", (_req, res) => {
         try {
-            const sessions = processes.listCodexHistorySessions();
+            const history = markManagedProviderHistory(processes.listCodexHistorySessions(), sessionRegistry.listSlim(), "codex");
             const hidden = getHiddenClaudeSessionIds(storage);
             const filtered = hidden.size > 0
-                ? sessions.filter((s) => !hidden.has(s.claudeSessionId))
-                : sessions;
+                ? history.filter((s) => !hidden.has(s.claudeSessionId))
+                : history;
             res.json(filtered);
         }
         catch (error) {