@co0ontty/wand 1.36.0 → 1.39.0

package/dist/claude-sdk-runner.d.ts

@@ -6,6 +6,13 @@ export declare class ClaudeRunError extends Error {
 export interface RunClaudePrintOptions {
     cwd?: string;
     timeoutMs: number;
+    /**
+     * 用户偏好的回复语言（取自 config.language）。传进来时会以
+     * `appendSystemPrompt` 形式灌给 Claude，保证 quick-commit / prompt-optimizer
+     * 这种一次性调用也跟用户主会话同语言——之前 wand 的 git commit message 会
+     * 莫名其妙变中英混搭，根因就在这。
+     */
+    language?: string;
 }
 /**
  * 用 `@anthropic-ai/claude-agent-sdk` 跑一次"prompt → 单段纯文本"调用，

package/dist/claude-sdk-runner.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import { query as sdkQuery, } from "@anthropic-ai/claude-agent-sdk";
+import { buildLanguageDirective } from "./language-prompt.js";
 export class ClaudeRunError extends Error {
     code;
     constructor(message, code) {
@@ -79,12 +80,14 @@ export async function runClaudePrint(prompt, options) {
     const abortController = new AbortController();
     const timeoutHandle = setTimeout(() => abortController.abort(), options.timeoutMs);
     const sdkClaudeBinary = resolveSdkClaudeBinary();
+    const languageDirective = options.language ? buildLanguageDirective(options.language) : "";
     const sdkOptions = {
         abortController,
         tools: [],
         persistSession: false,
         ...(cwd ? { cwd } : {}),
         ...(sdkClaudeBinary ? { pathToClaudeCodeExecutable: sdkClaudeBinary } : {}),
+        ...(languageDirective ? { appendSystemPrompt: languageDirective } : {}),
     };
     // 单条 user message → AsyncGenerator，SDK 的 streaming input 协议要求。
     async function* singleShot() {

package/dist/git-quick-commit.js

@@ -240,9 +240,9 @@ export class QuickCommitError extends Error {
     }
 }
 // ── AI commit message generation ──
-async function callClaudeText(prompt, cwd) {
+async function callClaudeText(prompt, cwd, language) {
     try {
-        return await runClaudePrint(prompt, { cwd, timeoutMs: CLAUDE_MESSAGE_TIMEOUT_MS });
+        return await runClaudePrint(prompt, { cwd, timeoutMs: CLAUDE_MESSAGE_TIMEOUT_MS, language });
     }
     catch (error) {
         if (error instanceof ClaudeRunError) {
@@ -283,7 +283,7 @@ async function generateCommitMessage(cwd, language) {
     const diff = collectStagedDiff(cwd);
     const lang = language.trim() || "中文";
     const prompt = `阅读以下 git diff，用${lang}写一条简洁的 commit message。要求：祈使句，不超过 50 字，描述「做了什么」。只输出 message 本身，不要引号、不要 Markdown 格式、不要任何额外说明。\n\n${diff}`;
-    const raw = await callClaudeText(prompt, cwd);
+    const raw = await callClaudeText(prompt, cwd, language);
     const message = raw.replace(/^["'`]+|["'`]+$/g, "").trim();
     if (!message) {
         throw new QuickCommitError("Claude 返回了空的 commit message。", "EMPTY_AI_MESSAGE");
@@ -339,7 +339,7 @@ async function generateCommitMessageWithTag(cwd, language) {
 
 git diff:
 ${diff}`;
-    const raw = await callClaudeText(prompt, cwd);
+    const raw = await callClaudeText(prompt, cwd, language);
     const parsed = tryParseJson(raw);
     let message;
     let suggestedTag;
@@ -413,7 +413,7 @@ commit message：${commitMessage}
 
 git diff：
 ${diff}`;
-    const raw = await callClaudeText(prompt, cwd);
+    const raw = await callClaudeText(prompt, cwd, language);
     const parsed = tryParseJson(raw);
     let suggested;
     if (parsed && typeof parsed.tag === "string") {

package/dist/language-prompt.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 强语言指令生成器：供 PTY runner、structured-session-manager（CLI + SDK 两个分支）、
+ * 一次性 SDK 调用（claude-sdk-runner.ts）共用。
+ *
+ * 原本各 runner 散落写 "请使用中文回复" 这种软指令，Claude 写技术内容时还是会条件
+ * 反射切英文（"Now let me ..."、"OK, ..."），用户设置中文也照样夹英文。
+ *
+ * 这一版用三招把约束做硬：
+ *   1. 明确禁止常见英文起句模式（"Now let me"、"Let me check"、"OK,"、"First,"
+ *      …）并给出反例——给 Claude 一组具体可识别可避免的字串
+ *   2. 区分"自然语言"（必须目标语言）和"技术标识符"（路径/命令/API 名可保留原文），
+ *      避免 Claude 误以为"代码也要翻译"
+ *   3. 自检指令：让 Claude 发现自己即将出错时主动重写
+ *
+ * 英文模式（"English"）下 Claude 默认就用英文，只补一句 subagent 透传。
+ */
+export declare function buildLanguageDirective(language: string): string;

package/dist/language-prompt.js

@@ -0,0 +1,68 @@
+/**
+ * 强语言指令生成器：供 PTY runner、structured-session-manager（CLI + SDK 两个分支）、
+ * 一次性 SDK 调用（claude-sdk-runner.ts）共用。
+ *
+ * 原本各 runner 散落写 "请使用中文回复" 这种软指令，Claude 写技术内容时还是会条件
+ * 反射切英文（"Now let me ..."、"OK, ..."），用户设置中文也照样夹英文。
+ *
+ * 这一版用三招把约束做硬：
+ *   1. 明确禁止常见英文起句模式（"Now let me"、"Let me check"、"OK,"、"First,"
+ *      …）并给出反例——给 Claude 一组具体可识别可避免的字串
+ *   2. 区分"自然语言"（必须目标语言）和"技术标识符"（路径/命令/API 名可保留原文），
+ *      避免 Claude 误以为"代码也要翻译"
+ *   3. 自检指令：让 Claude 发现自己即将出错时主动重写
+ *
+ * 英文模式（"English"）下 Claude 默认就用英文，只补一句 subagent 透传。
+ */
+export function buildLanguageDirective(language) {
+    const trimmed = language?.trim();
+    if (!trimmed)
+        return "";
+    const isChinese = trimmed === "中文";
+    const isEnglish = trimmed === "English" || trimmed.toLowerCase() === "english";
+    if (isEnglish) {
+        return "When you dispatch a subagent via the Task tool, instruct the subagent in its prompt to also respond in English.";
+    }
+    if (isChinese) {
+        return [
+            "【语言要求 — 最高优先级】",
+            "你必须始终使用中文进行所有自然语言交流。这是硬性约束，不是建议。",
+            "",
+            "覆盖范围：",
+            "- 所有解释、说明、推理、对话、注释、错误描述、TODO 标题、git commit message、思考内容",
+            "- 包括开场白、过渡句、状态汇报、回答用户问题",
+            "",
+            "严禁以下英文起句模式（即使是技术内容也不要用）：",
+            "- 不要写 \"Now let me ...\"、\"Now I'll ...\"、\"Now remove ...\"——改用 \"现在 ...\" 或直接进入正题",
+            "- 不要写 \"Let me check ...\"、\"Let me look at ...\"——改用 \"我看一下 ...\"、\"我检查一下 ...\"",
+            "- 不要写 \"OK, ...\"、\"Alright, ...\"、\"Great, ...\"——改用 \"好的\"、\"OK\" 中文或直接省略",
+            "- 不要写 \"First, ...\"、\"Then, ...\"、\"Finally, ...\"——改用 \"先\"、\"然后\"、\"最后\"",
+            "- 不要写 \"Found it!\"、\"Got it!\"——改用 \"找到了\"、\"明白\"",
+            "",
+            "可以保留原文的部分（这些不算\"自然语言\"）：",
+            "- 代码片段、shell 命令、文件路径、URL、API 名、库名、变量名、CSS 属性名等技术标识符",
+            "- 引用用户原话、错误信息原文、日志原文",
+            "",
+            "自检：如果你发现自己即将用英文开始一句话或一段话，立即停下，用中文重新组织语言。",
+            "",
+            "子代理：当你通过 Task 工具派发 subagent 时，必须在传给 subagent 的 prompt 里明确加上一句中文要求（例如 \"请用中文回复所有自然语言内容\"），保证子代理输出同样遵循。",
+        ].join("\n");
+    }
+    // 其他语言（日语、法语等）——用英文模板，把 language 替进去
+    return [
+        `[Language requirement — top priority]`,
+        `You MUST always use ${trimmed} for all natural-language communication. This is a hard constraint, not a suggestion.`,
+        "",
+        `Scope: all explanations, narration, reasoning, conversation, comments, error descriptions, TODO titles, git commit messages, and thinking content — including opening phrases, transitions, status updates, and answers to the user.`,
+        "",
+        `Strictly avoid starting sentences in English (e.g. "Now let me ...", "Let me check ...", "OK, ...", "First, ...", "Found it!"). Use the equivalent ${trimmed} phrasing instead, or skip the transition.`,
+        "",
+        `What may stay in its original form (these are NOT natural language):`,
+        `- Code, shell commands, file paths, URLs, API/library/variable names, CSS properties, other technical identifiers`,
+        `- Direct quotes of user input, raw error messages, raw log lines`,
+        "",
+        `Self-check: if you notice you are about to start a sentence in English, stop and rewrite it in ${trimmed}.`,
+        "",
+        `Subagent: when you dispatch a subagent via the Task tool, you MUST explicitly instruct the subagent in its prompt to also respond in ${trimmed}.`,
+    ].join("\n");
+}

package/dist/process-manager.d.ts

@@ -24,6 +24,18 @@ export interface ClaudeHistorySession {
     hasConversation: boolean;
     managedByWand: boolean;
 }
+/** A Codex session discovered by scanning ~/.codex/sessions/ rollout files. */
+export interface CodexHistorySession {
+    /** Codex thread id（存进 claudeSessionId 字段以复用前端/路由）。 */
+    claudeSessionId: string;
+    cwd: string;
+    firstUserMessage: string;
+    timestamp: string;
+    mtimeMs: number;
+    hasConversation: boolean;
+    managedByWand: boolean;
+    provider: "codex";
+}
 export declare class ProcessManager extends EventEmitter {
     private readonly config;
     private readonly storage;
@@ -65,6 +77,10 @@ export declare class ProcessManager extends EventEmitter {
         claudeSessionId: string;
         cwd: string;
     }[]): number;
+    private codexHistoryCache;
+    listCodexHistorySessions(): CodexHistorySession[];
+    hasCodexSessionFile(threadId: string): boolean;
+    deleteCodexHistoryFiles(threadIds: string[]): number;
     get(id: string): SessionSnapshot | null;
     getPtyTranscript(id: string): string | null;
     /**

package/dist/process-manager.js

@@ -10,6 +10,7 @@ import { ClaudePtyBridge } from "./claude-pty-bridge.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText, PTY_OUTPUT_MAX_SIZE } from "./pty-text-utils.js";
 import { buildChildEnv } from "./env-utils.js";
+import { buildLanguageDirective } from "./language-prompt.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getResumeCommandSessionId } from "./resume-policy.js";
 import { applyThinkingEffortToPrompt, normalizeThinkingEffort } from "./structured-session-manager.js";
@@ -295,6 +296,150 @@ function listAllClaudeHistorySessions() {
         return [];
     }
 }
+function getCodexSessionsDir() {
+    return path.join(os.homedir(), ".codex", "sessions");
+}
+/**
+ * codex 的 user message 里混杂了系统注入（AGENTS.md 指令、<environment_context> 等
+ * XML 包裹块），它们都以 "#" 或 "<" 开头。真正的用户输入是首条不以这两者开头的
+ * input_text。
+ */
+function isCodexSystemInjectedText(text) {
+    const trimmed = text.trimStart();
+    return trimmed.startsWith("#") || trimmed.startsWith("<");
+}
+/**
+ * Read the head of a rollout file to extract summary metadata. Codex prepends a
+ * large session_meta (full base_instructions + AGENTS.md + <environment_context>)
+ * before the first real user turn, so a small window misses it. 64KB covers the
+ * first real user message in every observed session.
+ */
+function readCodexSessionSummary(filePath) {
+    try {
+        const stats = statSync(filePath);
+        const fd = openSync(filePath, "r");
+        const buffer = Buffer.alloc(65536);
+        const bytesRead = readSync(fd, buffer, 0, 65536, 0);
+        closeSync(fd);
+        const chunk = buffer.toString("utf8", 0, bytesRead);
+        const lines = chunk.split("\n").filter((line) => line.trim().length > 0);
+        let id = "";
+        let cwd = "";
+        let timestamp = "";
+        let firstUserMessage = "";
+        let hasUser = false;
+        let hasAssistant = false;
+        for (const line of lines) {
+            let parsed;
+            try {
+                parsed = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            if (!timestamp && parsed.timestamp) {
+                timestamp = parsed.timestamp;
+            }
+            const payload = parsed.payload;
+            if (!payload)
+                continue;
+            if (parsed.type === "session_meta" || payload.type === "session_meta") {
+                if (!id && typeof payload.id === "string")
+                    id = payload.id;
+                if (!cwd && typeof payload.cwd === "string")
+                    cwd = payload.cwd;
+                continue;
+            }
+            if (payload.type === "message" && payload.role === "user") {
+                const text = Array.isArray(payload.content)
+                    ? payload.content
+                        .filter((b) => b?.type === "input_text" && typeof b.text === "string")
+                        .map((b) => b.text)
+                        .join("")
+                    : "";
+                if (text.trim()) {
+                    hasUser = true;
+                    if (!firstUserMessage && !isCodexSystemInjectedText(text)) {
+                        firstUserMessage = text.trim().slice(0, 120);
+                    }
+                }
+            }
+            else if (payload.type === "message" && payload.role === "assistant") {
+                hasAssistant = true;
+            }
+        }
+        if (!id)
+            return null;
+        return {
+            claudeSessionId: id,
+            cwd,
+            firstUserMessage,
+            timestamp: timestamp || new Date(stats.mtimeMs).toISOString(),
+            mtimeMs: stats.mtimeMs,
+            hasConversation: hasUser && hasAssistant,
+            managedByWand: false,
+            provider: "codex",
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/** Recursively collect rollout-*.jsonl paths under ~/.codex/sessions/. */
+function listCodexRolloutFiles() {
+    const root = getCodexSessionsDir();
+    try {
+        return readdirSync(root, { recursive: true, withFileTypes: true })
+            .filter((entry) => entry.isFile()
+            && entry.name.startsWith("rollout-")
+            && entry.name.endsWith(".jsonl"))
+            .map((entry) => {
+            // Node ≥ 20 dirents from a recursive read carry parentPath/path.
+            const parent = entry.parentPath
+                ?? entry.path
+                ?? root;
+            return path.join(parent, entry.name);
+        });
+    }
+    catch {
+        return [];
+    }
+}
+/** Scan ~/.codex/sessions/ and return one entry per thread id (newest rollout wins). */
+function listAllCodexHistorySessions() {
+    const files = listCodexRolloutFiles();
+    // 同一 thread 同一天可能有多个 rollout 文件，按 thread id 去重保留 mtime 最新。
+    const byThread = new Map();
+    for (const filePath of files) {
+        const summary = readCodexSessionSummary(filePath);
+        if (!summary)
+            continue;
+        const existing = byThread.get(summary.claudeSessionId);
+        if (!existing || summary.mtimeMs > existing.mtimeMs) {
+            byThread.set(summary.claudeSessionId, summary);
+        }
+    }
+    return Array.from(byThread.values()).sort((a, b) => b.mtimeMs - a.mtimeMs);
+}
+/** Delete every rollout file belonging to the given codex thread ids. */
+function deleteCodexRolloutFiles(threadIds) {
+    if (threadIds.size === 0)
+        return 0;
+    let deleted = 0;
+    for (const filePath of listCodexRolloutFiles()) {
+        const summary = readCodexSessionSummary(filePath);
+        if (summary && threadIds.has(summary.claudeSessionId)) {
+            try {
+                unlinkSync(filePath);
+                deleted++;
+            }
+            catch {
+                // Best-effort — file may already be gone
+            }
+        }
+    }
+    return deleted;
+}
 function snapshotMessages(record) {
     return record.ptyBridge?.getMessages() ?? record.messages;
 }
@@ -897,6 +1042,41 @@ export class ProcessManager extends EventEmitter {
         }
         return deleted;
     }
+    codexHistoryCache = null;
+    listCodexHistorySessions() {
+        const now = Date.now();
+        if (this.codexHistoryCache && now < this.codexHistoryCache.expiresAt) {
+            return this.codexHistoryCache.data;
+        }
+        const allSessions = listAllCodexHistorySessions();
+        // Cross-reference with wand-managed sessions（codex 的 thread id 存在 claudeSessionId 字段）
+        const managedIds = new Set();
+        for (const record of this.sessions.values()) {
+            if (record.provider === "codex" && record.claudeSessionId) {
+                managedIds.add(record.claudeSessionId);
+            }
+        }
+        for (const session of allSessions) {
+            if (managedIds.has(session.claudeSessionId)) {
+                session.managedByWand = true;
+            }
+        }
+        this.codexHistoryCache = { data: allSessions, expiresAt: now + ProcessManager.HISTORY_CACHE_TTL_MS };
+        return allSessions;
+    }
+    hasCodexSessionFile(threadId) {
+        if (!UUID_V4_PATTERN.test(threadId))
+            return false;
+        return listAllCodexHistorySessions().some((s) => s.claudeSessionId === threadId);
+    }
+    deleteCodexHistoryFiles(threadIds) {
+        const valid = new Set(threadIds.filter((id) => UUID_V4_PATTERN.test(id)));
+        const deleted = deleteCodexRolloutFiles(valid);
+        if (valid.size > 0) {
+            this.codexHistoryCache = null;
+        }
+        return deleted;
+    }
     get(id) {
         const record = this.sessions.get(id);
         if (!record) {
@@ -1657,11 +1837,13 @@ export class ProcessManager extends EventEmitter {
             result += ` --append-system-prompt '${escaped}'`;
         }
         if (language) {
-            const langPrompt = isChinese
-                ? "请使用中文回复。所有解释、注释和对话文本都使用中文。"
-                : `Please respond in ${language}. Use ${language} for all your explanations, comments, and conversational text.`;
-            const escaped = langPrompt.replace(/'/g, "'\\''");
-            result += ` --append-system-prompt '${escaped}'`;
+            // 与 structured-session-manager.ts 走同一个 buildLanguageDirective，保证 PTY 与
+            // structured 两种 runner 用同一条强约束指令——避免"换个模式 Claude 又开始夹英文"。
+            const langPrompt = buildLanguageDirective(language);
+            if (langPrompt) {
+                const escaped = langPrompt.replace(/'/g, "'\\''");
+                result += ` --append-system-prompt '${escaped}'`;
+            }
         }
         return result;
     }

package/dist/prompt-optimizer.js

@@ -9,9 +9,9 @@ export class PromptOptimizeError extends Error {
         this.name = "PromptOptimizeError";
     }
 }
-async function callClaudeText(prompt, cwd) {
+async function callClaudeText(prompt, cwd, language) {
     try {
-        return await runClaudePrint(prompt, { cwd, timeoutMs: CLAUDE_TIMEOUT_MS });
+        return await runClaudePrint(prompt, { cwd, timeoutMs: CLAUDE_TIMEOUT_MS, language });
     }
     catch (error) {
         if (error instanceof ClaudeRunError) {
@@ -50,7 +50,7 @@ export async function optimizePrompt(rawText, language, cwd) {
         throw new PromptOptimizeError(`输入过长（${text.length} 字符），请缩短到 ${MAX_INPUT_LENGTH} 以内。`, "INPUT_TOO_LONG");
     }
     const prompt = buildOptimizePrompt(text, language);
-    const raw = await callClaudeText(prompt, cwd);
+    const raw = await callClaudeText(prompt, cwd, language);
     const cleaned = raw
         .replace(/^```[a-zA-Z]*\n?/, "")
         .replace(/\n?```$/, "")

package/dist/pwa.js

@@ -1,15 +1,45 @@
 /**
  * PWA manifest and Service Worker generation.
  */
-import { readFileSync } from "node:fs";
+import { readFileSync, existsSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgPath = path.join(__dirname, "..", "package.json");
 const pkgVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version ?? "0";
-/** Cache version derived from package version — only busts on actual releases */
-const CACHE_VERSION = createHash("md5").update(pkgVersion).digest("hex").slice(0, 8);
+/** Cache version: package version + content fingerprint.
+ *
+ * 之前只用 pkgVersion 派生，本地 dev 时同一个 1.36.0 下改了几次 CSS / scripts，
+ * SW 的 cache key 都没变 → 旧的 RUNTIME_CACHE 会一直回放老 HTML 给已安装 PWA，
+ * 用户表现是"我明明改了 UI，怎么手机上一点变化都没有"。
+ * 把内容 mtime 也喂进 hash，dev iterate 时每次磁盘改动都换 cache key，
+ * SW activate 会把不匹配前缀的缓存 keys 删掉，从而强制重拉。
+ * 正式发版时由于 pkgVersion 也会变，效果叠加，无副作用。
+ */
+function buildCacheVersion() {
+    const h = createHash("md5").update(pkgVersion);
+    const fingerprintTargets = [
+        path.join(__dirname, "web-ui", "content", "scripts.js"),
+        path.join(__dirname, "web-ui", "content", "styles.css"),
+    ];
+    for (const p of fingerprintTargets) {
+        try {
+            if (existsSync(p)) {
+                const s = statSync(p);
+                h.update(":").update(p).update(":").update(String(s.mtimeMs)).update(":").update(String(s.size));
+            }
+        }
+        catch {
+            // best effort — fingerprint 只是为了 bust 缓存，失败就退化成 pkg-only
+        }
+    }
+    return h.digest("hex").slice(0, 8);
+}
+// 不 freeze 进模块加载时——SW JS 是每次请求 generateServiceWorker() 现拼的，
+// 这里也对应每次现算，dev 改 CSS 不用重启进程都能 bust 浏览器/PWA 端缓存。
+// 缓存层会自己做 mtime check（styles.ts 的 mtime 缓存模式同思路），这里直接
+// statSync，磁盘命中本地 fs 几十微秒级，可忽略。
 export function generatePwaManifest() {
     return JSON.stringify({
         id: "/wand",
@@ -44,9 +74,10 @@ export function generatePwaManifest() {
     });
 }
 export function generateServiceWorker() {
+    const cacheVersion = buildCacheVersion();
     return `
-const STATIC_CACHE = 'wand-static-${CACHE_VERSION}';
-const RUNTIME_CACHE = 'wand-runtime-${CACHE_VERSION}';
+const STATIC_CACHE = 'wand-static-${cacheVersion}';
+const RUNTIME_CACHE = 'wand-runtime-${cacheVersion}';
 const APP_SHELL = '/';
 const STATIC_ASSETS = [
   '/manifest.json',

package/dist/server-session-routes.js

@@ -699,6 +699,41 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(response.statusCode).json(response.payload);
         }
     });
+    app.post("/api/codex-sessions/:threadId/resume", express.json(), async (req, res) => {
+        const threadId = String(req.params.threadId || "").trim();
+        const body = req.body;
+        console.log("[WAND] POST /api/codex-sessions/:threadId/resume threadId:", threadId, "cwd:", body.cwd);
+        try {
+            if (!threadId) {
+                res.status(400).json({ error: "Codex 会话 ID 不能为空。" });
+                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 = normalizeMode(body.mode, defaultMode);
+            const snapshot = structured.createSession({
+                cwd,
+                mode: newMode,
+                provider: "codex",
+                runner: "codex-cli-exec",
+                worktreeEnabled: body.worktreeEnabled === true,
+                claudeSessionId: threadId,
+            });
+            onSessionCreated?.(cwd);
+            res.status(201).json({ resumedClaudeSessionId: threadId, ...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 {
@@ -907,4 +942,79 @@ export function registerClaudeHistoryRoutes(app, processes, storage) {
             res.status(500).json({ error: getErrorMessage(error, "无法批量删除历史会话。") });
         }
     });
+    // ── Codex history（~/.codex/sessions/ 扫描，对齐 Claude 历史区） ──
+    // codex 历史的"恢复"是新建一个结构化 codex 会话并预填 thread id（存进 claudeSessionId
+    // 字段），用户发第一条消息时 buildCodexArgs 自动拼 `codex exec ... resume <thread_id>`。
+    // hidden 集合与 claude 共用（id 全局唯一，不会冲突）。
+    app.get("/api/codex-history", (_req, res) => {
+        try {
+            const sessions = processes.listCodexHistorySessions();
+            const hidden = getHiddenClaudeSessionIds(storage);
+            const filtered = hidden.size > 0
+                ? sessions.filter((s) => !hidden.has(s.claudeSessionId))
+                : sessions;
+            res.json(filtered);
+        }
+        catch (error) {
+            res.status(500).json({ error: getErrorMessage(error, "无法扫描 Codex 历史会话。") });
+        }
+    });
+    app.delete("/api/codex-history/:threadId", (req, res) => {
+        const threadId = req.params.threadId?.trim();
+        if (!threadId) {
+            res.status(400).json({ error: "会话 ID 不能为空。" });
+            return;
+        }
+        const exists = processes.listCodexHistorySessions().some((s) => s.claudeSessionId === threadId);
+        if (exists) {
+            processes.deleteCodexHistoryFiles([threadId]);
+            removeFromHiddenClaudeSessionIds(storage, [threadId]);
+        }
+        else {
+            const hidden = getHiddenClaudeSessionIds(storage);
+            if (!hidden.has(threadId)) {
+                hidden.add(threadId);
+                saveHiddenClaudeSessionIds(storage, hidden);
+            }
+        }
+        res.json({ ok: true });
+    });
+    app.post("/api/codex-history/batch-delete", express.json(), (req, res) => {
+        const threadIds = Array.isArray(req.body?.claudeSessionIds)
+            ? req.body.claudeSessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)
+            : [];
+        if (threadIds.length === 0) {
+            res.status(400).json({ error: "至少提供一个历史会话 ID。" });
+            return;
+        }
+        try {
+            const existing = new Set(processes.listCodexHistorySessions().map((s) => s.claudeSessionId));
+            const toDelete = [];
+            const toHide = [];
+            for (const id of threadIds) {
+                if (existing.has(id))
+                    toDelete.push(id);
+                else
+                    toHide.push(id);
+            }
+            const deleted = processes.deleteCodexHistoryFiles(toDelete);
+            removeFromHiddenClaudeSessionIds(storage, toDelete);
+            if (toHide.length > 0) {
+                const hidden = getHiddenClaudeSessionIds(storage);
+                let added = 0;
+                for (const id of toHide) {
+                    if (!hidden.has(id)) {
+                        hidden.add(id);
+                        added++;
+                    }
+                }
+                if (added > 0)
+                    saveHiddenClaudeSessionIds(storage, hidden);
+            }
+            res.json({ ok: true, deleted: deleted + toHide.length });
+        }
+        catch (error) {
+            res.status(500).json({ error: getErrorMessage(error, "无法批量删除历史会话。") });
+        }
+    });
 }

package/dist/server.js

@@ -1097,6 +1097,9 @@ export async function startServer(config, configPath) {
             ],
             structuredChatPersona,
             cardDefaults: config.cardDefaults,
+            // 把语言偏好暴露给前端做 UI 文案 i18n。后端原本只用它给 Claude 拼 system prompt，
+            // 前端没收到 → "SUBAGENT" / "Read" 这些 UI label 一直是英文，跟用户设的中文不匹配。
+            language: config.language ?? "",
             updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
             latestVersion: cachedUpdateInfo?.latest ?? null,
             currentVersion: PKG_VERSION,