@co0ontty/wand 1.37.0 → 1.39.0

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

@@ -296,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;
 }
@@ -898,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) {

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/structured-session-manager.d.ts

@@ -12,6 +12,13 @@ interface CreateStructuredSessionOptions {
     model?: string;
     /** 用户预设的思考深度。留空 / null 视为 off。 */
     thinkingEffort?: SessionSnapshot["thinkingEffort"];
+    /**
+     * 恢复用的初始会话 id：
+     *   - Codex：历史 thread id，首条消息即 `codex exec ... resume <id>` 续接。
+     *   - Claude：历史 session id，首条消息即 `--resume` / SDK resume 续接。
+     * 留空表示新建会话。
+     */
+    claudeSessionId?: string;
 }
 /**
  * 把任意外部输入收敛到合法的 thinkingEffort 枚举值。`null` / 非法值都视为
@@ -150,6 +157,47 @@ export declare class StructuredSessionManager {
     private normalizeToolInput;
     private normalizeToolResultContent;
     private extractCodexText;
+    /**
+     * Merge one codex `item.*` event into `turnState.blocks`.
+     *
+     * 三种 phase 行为：
+     *   - "started":   首次出现的 item，块直接 push（tool_result 走 upsert 配对）。
+     *                  text/thinking/TodoWrite 这种"靠 id 替换"的块记录到
+     *                  codexBlockIndex 里，方便后续 updated/completed 找回原位。
+     *   - "updated":   codex 重发完整 ThreadItem（不是 delta）。已记录过的块就
+     *                  替换；新块按 started 路径处理。
+     *   - "completed": 把"in_progress"卡片定型——text 同时更新 turnState.result
+     *                  以便 result fallback 不为空；tool_use ↔ tool_result 通过
+     *                  共享 id 配对到一起（包括 file_change 子项的 `${id}#i`）。
+     */
+    private applyCodexItem;
+    /**
+     * Map a codex `item.{started,updated,completed}` payload into wand's
+     * `ContentBlock[]` so the chat UI's existing tool/diff/todo cards just work.
+     *
+     * Codex `exec --json` emits 8 item.type values (see
+     * `codex-rs/exec/src/exec_events.rs`); below they're routed to whatever wand
+     * tool name reuses an existing renderer:
+     *
+     *   agent_message     → text
+     *   reasoning         → thinking
+     *   command_execution → tool_use "Bash" + tool_result
+     *   file_change       → one tool_use per file, named Edit/Write/Bash by `kind`
+     *                       (codex does NOT carry old_string/new_string in the
+     *                       exec stream, only the path list; diff card body is
+     *                       empty but the file row + status still render)
+     *   mcp_tool_call     → tool_use named "<server>__<tool>" + tool_result
+     *   web_search        → tool_use "WebSearch" + tool_result (results not in stream)
+     *   todo_list         → tool_use "TodoWrite" (replaced in place on each update)
+     *   error             → text block prefixed with ❌
+     *
+     * Returns [] when there is nothing to emit yet (e.g. agent_message at
+     * `item.started` before any text has been produced).
+     *
+     * Callers handle in-place replacement for `item.updated` via
+     * `turnState.codexBlockIndex`; tool_use ↔ tool_result pairing still goes
+     * through `upsertCodexBlock` by matching ids.
+     */
     private extractCodexItemBlock;
     private upsertCodexBlock;
     /**

package/dist/structured-session-manager.js

@@ -580,7 +580,7 @@ export class StructuredSessionManager {
             output: "",
             archived: false,
             archivedAt: null,
-            claudeSessionId: null,
+            claudeSessionId: options.claudeSessionId?.trim() || null,
             messages: [],
             queuedMessages: [],
             structuredState: {
@@ -1161,6 +1161,7 @@ export class StructuredSessionManager {
                 sessionId: session.claudeSessionId,
                 model: session.selectedModel ?? session.structuredState?.model,
                 usage: undefined,
+                codexBlockIndex: new Map(),
             };
             let lineBuf = "";
             let stderr = "";
@@ -1232,23 +1233,24 @@ export class StructuredSessionManager {
                     return;
                 }
                 if (parsed?.type === "item.started" && parsed.item) {
-                    const block = this.extractCodexItemBlock(parsed.item, false);
-                    if (block) {
-                        turnState.blocks.push(block);
-                        syncSnapshot();
-                        scheduleEmit();
-                    }
+                    this.applyCodexItem(turnState, parsed.item, "started");
+                    syncSnapshot();
+                    scheduleEmit();
+                    return;
+                }
+                if (parsed?.type === "item.updated" && parsed.item) {
+                    // codex `item.updated` 重新发送完整 ThreadItem（不是 delta）。
+                    // 对 text/thinking/TodoWrite 走 codexBlockIndex 替换；对 tool_use
+                    // 仍然按现有 id 复用，避免重复卡片。
+                    this.applyCodexItem(turnState, parsed.item, "updated");
+                    syncSnapshot();
+                    scheduleEmit();
                     return;
                 }
                 if (parsed?.type === "item.completed" && parsed.item) {
-                    const block = this.extractCodexItemBlock(parsed.item, true);
-                    if (block) {
-                        if (block.type === "text")
-                            turnState.result = block.text;
-                        this.upsertCodexBlock(turnState.blocks, block);
-                        syncSnapshot();
-                        scheduleEmit();
-                    }
+                    this.applyCodexItem(turnState, parsed.item, "completed");
+                    syncSnapshot();
+                    scheduleEmit();
                     return;
                 }
                 if (parsed?.type === "turn.completed") {
@@ -2563,16 +2565,88 @@ export class StructuredSessionManager {
         }
         return "";
     }
+    /**
+     * Merge one codex `item.*` event into `turnState.blocks`.
+     *
+     * 三种 phase 行为：
+     *   - "started":   首次出现的 item，块直接 push（tool_result 走 upsert 配对）。
+     *                  text/thinking/TodoWrite 这种"靠 id 替换"的块记录到
+     *                  codexBlockIndex 里，方便后续 updated/completed 找回原位。
+     *   - "updated":   codex 重发完整 ThreadItem（不是 delta）。已记录过的块就
+     *                  替换；新块按 started 路径处理。
+     *   - "completed": 把"in_progress"卡片定型——text 同时更新 turnState.result
+     *                  以便 result fallback 不为空；tool_use ↔ tool_result 通过
+     *                  共享 id 配对到一起（包括 file_change 子项的 `${id}#i`）。
+     */
+    applyCodexItem(turnState, item, phase) {
+        const completed = phase === "completed";
+        const itemId = typeof item.id === "string" ? item.id : "";
+        const blocks = this.extractCodexItemBlock(item, completed);
+        if (blocks.length === 0)
+            return;
+        const index = turnState.codexBlockIndex ??= new Map();
+        for (const block of blocks) {
+            // text / thinking / TodoWrite tool_use 的卡片是"按 item id 整体替换"语义，
+            // 否则一个 agent_message 在 updated/completed 时会被重复 push 多次。
+            const replaceable = block.type === "text"
+                || block.type === "thinking"
+                || (block.type === "tool_use" && block.name === "TodoWrite");
+            if (replaceable && itemId) {
+                const existing = index.get(itemId);
+                if (existing !== undefined && existing < turnState.blocks.length) {
+                    turnState.blocks[existing] = block;
+                }
+                else {
+                    index.set(itemId, turnState.blocks.length);
+                    turnState.blocks.push(block);
+                }
+                if (block.type === "text" && completed) {
+                    turnState.result = block.text;
+                }
+                continue;
+            }
+            // 其它块（tool_use 非 Todo / tool_result / 文件改动的多 sub-id 块）
+            // 仍然走原有 upsert：tool_result 按 tool_use_id 配对，其余直接 push。
+            this.upsertCodexBlock(turnState.blocks, block);
+        }
+    }
+    /**
+     * Map a codex `item.{started,updated,completed}` payload into wand's
+     * `ContentBlock[]` so the chat UI's existing tool/diff/todo cards just work.
+     *
+     * Codex `exec --json` emits 8 item.type values (see
+     * `codex-rs/exec/src/exec_events.rs`); below they're routed to whatever wand
+     * tool name reuses an existing renderer:
+     *
+     *   agent_message     → text
+     *   reasoning         → thinking
+     *   command_execution → tool_use "Bash" + tool_result
+     *   file_change       → one tool_use per file, named Edit/Write/Bash by `kind`
+     *                       (codex does NOT carry old_string/new_string in the
+     *                       exec stream, only the path list; diff card body is
+     *                       empty but the file row + status still render)
+     *   mcp_tool_call     → tool_use named "<server>__<tool>" + tool_result
+     *   web_search        → tool_use "WebSearch" + tool_result (results not in stream)
+     *   todo_list         → tool_use "TodoWrite" (replaced in place on each update)
+     *   error             → text block prefixed with ❌
+     *
+     * Returns [] when there is nothing to emit yet (e.g. agent_message at
+     * `item.started` before any text has been produced).
+     *
+     * Callers handle in-place replacement for `item.updated` via
+     * `turnState.codexBlockIndex`; tool_use ↔ tool_result pairing still goes
+     * through `upsertCodexBlock` by matching ids.
+     */
     extractCodexItemBlock(item, completed) {
         const id = typeof item.id === "string" ? item.id : randomUUID();
         const type = typeof item.type === "string" ? item.type : "unknown";
         if (type === "agent_message") {
             const text = this.extractCodexText(item);
-            return text ? { type: "text", text } : null;
+            return text ? [{ type: "text", text }] : [];
         }
         if (type === "reasoning") {
             const text = this.extractCodexText(item);
-            return text ? { type: "thinking", thinking: text } : null;
+            return text ? [{ type: "thinking", thinking: text }] : [];
         }
         if (type === "command_execution") {
             const command = typeof item.command === "string" ? item.command : "";
@@ -2580,28 +2654,213 @@ export class StructuredSessionManager {
             const exitCode = typeof item.exit_code === "number" ? item.exit_code : null;
             const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
             if (!completed) {
+                return [{
+                        type: "tool_use",
+                        id,
+                        name: "Bash",
+                        input: { command, status },
+                    }];
+            }
+            // codex 的 status 可能是 declined（sandbox 拒了命令）/ failed（执行失败）—
+            // 这时 exit_code 经常是 null，光靠 exitCode !== 0 判 is_error 会漏。
+            const isError = status === "failed" || status === "declined"
+                || (typeof exitCode === "number" && exitCode !== 0);
+            const fallbackText = status === "declined"
+                ? "command declined by sandbox"
+                : (exitCode === null ? "" : `exit_code: ${exitCode}`);
+            return [{
+                    type: "tool_result",
+                    tool_use_id: id,
+                    content: aggregatedOutput || fallbackText,
+                    is_error: isError,
+                }];
+        }
+        if (type === "file_change") {
+            // 注意：codex exec stream 没有 old_string/new_string——只给 path + kind。
+            // 这里每个 file 一个 sub-id（`${item.id}#${i}`），这样如果 codex 一次给多
+            // 个文件，每个文件能独立成卡片 + 独立 tool_result 状态。
+            const rawChanges = Array.isArray(item.changes) ? item.changes : [];
+            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
+            const isError = status === "failed";
+            const blocks = [];
+            rawChanges.forEach((entry, idx) => {
+                if (!entry || typeof entry !== "object")
+                    return;
+                const change = entry;
+                const path = typeof change.path === "string" ? change.path : "";
+                const kind = typeof change.kind === "string" ? change.kind : "update";
+                const subId = `${id}#${idx}`;
+                let toolName;
+                let input;
+                if (kind === "add") {
+                    toolName = "Write";
+                    input = { file_path: path, content: "" };
+                }
+                else if (kind === "delete") {
+                    // 复用 Bash 终端卡，rm 语义直观
+                    toolName = "Bash";
+                    input = { command: `rm ${path}`, description: `delete ${path}`, status };
+                }
+                else {
+                    toolName = "Edit";
+                    input = { file_path: path, old_string: "", new_string: "" };
+                }
+                if (!completed) {
+                    blocks.push({ type: "tool_use", id: subId, name: toolName, input });
+                }
+                else {
+                    blocks.push({ type: "tool_use", id: subId, name: toolName, input });
+                    blocks.push({
+                        type: "tool_result",
+                        tool_use_id: subId,
+                        content: isError ? `file change failed: ${path}` : "",
+                        is_error: isError,
+                    });
+                }
+            });
+            return blocks;
+        }
+        if (type === "mcp_tool_call") {
+            const server = typeof item.server === "string" ? item.server : "mcp";
+            const tool = typeof item.tool === "string" ? item.tool : "tool";
+            const args = item.arguments && typeof item.arguments === "object" ? item.arguments : {};
+            const errObj = item.error && typeof item.error === "object" ? item.error : null;
+            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
+            const isError = !!errObj || status === "failed";
+            if (!completed) {
+                return [{
+                        type: "tool_use",
+                        id,
+                        name: `${server}__${tool}`,
+                        input: args,
+                    }];
+            }
+            let resultText = "";
+            if (errObj && typeof errObj.message === "string") {
+                resultText = errObj.message;
+            }
+            else if (item.result && typeof item.result === "object") {
+                const resultRec = item.result;
+                const inner = this.extractCodexText(resultRec.content);
+                resultText = inner || JSON.stringify(resultRec).slice(0, 4096);
+            }
+            return [{
+                    type: "tool_result",
+                    tool_use_id: id,
+                    content: resultText,
+                    is_error: isError,
+                }];
+        }
+        if (type === "web_search") {
+            const query = typeof item.query === "string" ? item.query : "";
+            if (!completed) {
+                return [{
+                        type: "tool_use",
+                        id,
+                        name: "WebSearch",
+                        input: { query },
+                    }];
+            }
+            return [{
+                    type: "tool_result",
+                    tool_use_id: id,
+                    // codex 不在 exec 流里回 search 结果，这里给个占位让 UI 卡片完成态。
+                    content: query ? `query: ${query}` : "",
+                }];
+        }
+        if (type === "collab_tool_call") {
+            // codex 的子-agent 编排（spawn_agent / send_input / wait / close_agent）。
+            // 没有对应 Claude tool，所以名称用 "Codex/<op>" 让 UI 默认 tool 卡渲染时
+            // 一眼能看出来是 codex 多 agent 操作。
+            const tool = typeof item.tool === "string" ? item.tool : "collab";
+            const prompt = typeof item.prompt === "string" ? item.prompt : "";
+            const senderId = typeof item.sender_thread_id === "string" ? item.sender_thread_id : "";
+            const receiverIds = Array.isArray(item.receiver_thread_ids)
+                ? item.receiver_thread_ids.filter((v) => typeof v === "string")
+                : [];
+            const agentsStates = item.agents_states && typeof item.agents_states === "object"
+                ? item.agents_states
+                : {};
+            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
+            const toolName = `Codex/${tool}`;
+            const input = { tool };
+            if (prompt)
+                input.prompt = prompt;
+            if (senderId)
+                input.sender_thread_id = senderId;
+            if (receiverIds.length > 0)
+                input.receiver_thread_ids = receiverIds;
+            if (Object.keys(agentsStates).length > 0)
+                input.agents_states = agentsStates;
+            if (!completed) {
+                return [{ type: "tool_use", id, name: toolName, input }];
+            }
+            // 完成态：把每个 receiver agent 的最终状态汇总成可读 result。
+            const summaryLines = [];
+            for (const [tid, state] of Object.entries(agentsStates)) {
+                if (!state || typeof state !== "object")
+                    continue;
+                const rec = state;
+                const s = typeof rec.status === "string" ? rec.status : "?";
+                const msg = typeof rec.message === "string" && rec.message ? ` — ${rec.message}` : "";
+                summaryLines.push(`${tid.slice(0, 8)}: ${s}${msg}`);
+            }
+            const isError = status === "failed"
+                || summaryLines.some((l) => /errored|not_found|interrupted/.test(l));
+            const content = summaryLines.length > 0
+                ? summaryLines.join("\n")
+                : (status === "completed" ? "ok" : status);
+            return [
+                { type: "tool_use", id, name: toolName, input },
+                { type: "tool_result", tool_use_id: id, content, is_error: isError },
+            ];
+        }
+        if (type === "todo_list") {
+            // codex 的 todo: { items: [{ text, completed: bool }] }
+            // wand UI（renderTodoWrite）读的是 block.input.todos = [{content, status, activeForm}]
+            // 这里做形状翻译；in_progress 状态 codex 不区分，全部 pending → completed 二值。
+            const rawItems = Array.isArray(item.items) ? item.items : [];
+            const todos = rawItems.map((entry) => {
+                const rec = (entry && typeof entry === "object") ? entry : {};
+                const text = typeof rec.text === "string" ? rec.text : "";
+                const done = rec.completed === true;
                 return {
+                    content: text,
+                    status: done ? "completed" : "pending",
+                    activeForm: text,
+                };
+            });
+            return [{
                     type: "tool_use",
                     id,
-                    name: "Bash",
-                    input: { command, status },
-                };
-            }
-            return {
-                type: "tool_result",
-                tool_use_id: id,
-                content: aggregatedOutput || (exitCode === null ? "" : `exit_code: ${exitCode}`),
-                is_error: typeof exitCode === "number" && exitCode !== 0,
-            };
+                    name: "TodoWrite",
+                    input: { todos },
+                }];
+        }
+        if (type === "error") {
+            // item-level error（不是 top-level error 事件，那个走 codexErrors / 退出报错路径）
+            const message = this.extractCodexText(item) || "codex item error";
+            return [{ type: "text", text: `❌ ${message}` }];
         }
+        // unknown / 兜底：completed 时尝试取 text 字段免得 silently 丢
         if (completed) {
             const text = this.extractCodexText(item);
             if (text)
-                return { type: "text", text };
+                return [{ type: "text", text }];
         }
-        return null;
+        return [];
     }
     upsertCodexBlock(blocks, block) {
+        // tool_use 按 id 去重——file_change 在 item.started 已经 push 过一份 tool_use，
+        // 到 item.completed 还会再发一份相同 id 的（带 status 更新），不去重就出现
+        // 两张同名卡片。command_execution 不受影响（它在 completed 只 emit tool_result）。
+        if (block.type === "tool_use") {
+            const existingIndex = blocks.findIndex((existing) => existing.type === "tool_use" && existing.id === block.id);
+            if (existingIndex >= 0) {
+                blocks[existingIndex] = block;
+                return;
+            }
+        }
         if (block.type === "tool_result") {
             const toolUseIndex = blocks.findIndex((existing) => existing.type === "tool_use" && existing.id === block.tool_use_id);
             if (toolUseIndex >= 0) {
@@ -2725,8 +2984,12 @@ export class StructuredSessionManager {
             inputTokens: typeof source.input_tokens === "number" ? source.input_tokens : undefined,
             outputTokens: typeof source.output_tokens === "number" ? source.output_tokens : undefined,
             cacheReadInputTokens: typeof source.cached_input_tokens === "number" ? source.cached_input_tokens : undefined,
+            reasoningOutputTokens: typeof source.reasoning_output_tokens === "number" ? source.reasoning_output_tokens : undefined,
         };
-        if (value.inputTokens === undefined && value.outputTokens === undefined && value.cacheReadInputTokens === undefined) {
+        if (value.inputTokens === undefined
+            && value.outputTokens === undefined
+            && value.cacheReadInputTokens === undefined
+            && value.reasoningOutputTokens === undefined) {
             return undefined;
         }
         return value;

package/dist/types.d.ts

@@ -365,6 +365,8 @@ export interface ConversationTurn {
         outputTokens?: number;
         cacheReadInputTokens?: number;
         cacheCreationInputTokens?: number;
+        /** codex 专属：reasoning_output_tokens（GPT-5 等带思考模型，per-turn 计费）。 */
+        reasoningOutputTokens?: number;
         totalCostUsd?: number;
     };
 }

package/dist/web-ui/content/scripts.js

@@ -370,6 +370,10 @@
         sessionsManageMode: false,
         selectedSessionIds: {},
         selectedClaudeHistoryIds: {},
+        codexHistory: [],
+        codexHistoryLoaded: false,
+        codexHistoryExpandedDirs: {},
+        selectedCodexHistoryIds: {},
         askUserSelections: {},  // { toolUseId: { 0: [optIdx...], submitted: false } }
         queueEpoch: 0,  // Monotonic counter for queue state freshness
         pendingAttachments: [],  // [{ file, previewUrl, name, size }]
@@ -2358,6 +2362,10 @@
           state.quickCommitForm.makeTag = tagCb.checked;
           var row = document.getElementById("quick-commit-tag-row");
           if (row) row.classList.toggle("hidden", !tagCb.checked);
+          if (tagCb.checked) {
+            var input = document.getElementById("quick-commit-tag");
+            if (input) setTimeout(function() { input.focus(); }, 0);
+          }
         });
         var tagInput = document.getElementById("quick-commit-tag");
         if (tagInput) tagInput.addEventListener("input", function() {
@@ -2485,9 +2493,8 @@
               state.quickCommitForm.customMessage = aiMessage;
             }
             var currentTag = (state.quickCommitForm.tag || "").trim();
-            if (!currentTag && aiTag) {
+            if (state.quickCommitForm.makeTag && !currentTag && aiTag) {
               state.quickCommitForm.tag = aiTag;
-              state.quickCommitForm.makeTag = true;
             }
           })
           .catch(function(error) {
@@ -2848,19 +2855,21 @@
             '<div class="qc-files-wrap">' + fileRows + '</div>' +
             '<div class="qc-message-row" id="quick-commit-message-row">' +
               '<div class="qc-message-header"><label class="field-label" for="quick-commit-message">commit message</label>' +
-                '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
+                '<div class="qc-ai-controls">' +
+                  '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
+                  '<label class="qc-ai-tag-toggle" title="开启后，AI 会一并建议 tag，提交时会为本次 commit 打 tag">' +
+                    '<span class="qc-ai-tag-label">含 tag</span>' +
+                    '<span class="qc-switch qc-switch--compact">' +
+                      '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle" aria-label="同时为本次 commit 打 tag"' + (f.makeTag ? ' checked' : '') + ((state.quickCommitSubmitting || state.quickCommitGenerating) ? ' disabled' : '') + '>' +
+                      '<span class="switch-slider"></span>' +
+                    '</span>' +
+                  '</label>' +
+                '</div>' +
               '</div>' +
               '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' + escapeHtml(f.customMessage || "") + '</textarea>' +
             '</div>' +
-            '<div class="qc-checkbox-row">' +
-              '<label class="qc-checkbox-label" for="quick-commit-make-tag">同时为本次 commit 打 tag</label>' +
-              '<label class="qc-switch">' +
-                '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle"' + (f.makeTag ? ' checked' : '') + '>' +
-                '<span class="switch-slider"></span>' +
-              '</label>' +
-            '</div>' +
             '<div class="qc-tag-row' + (f.makeTag ? '' : ' hidden') + '" id="quick-commit-tag-row">' +
-              '<input type="text" id="quick-commit-tag" class="field-input" placeholder="输入 tag 名称；留空将由 AI 在提交时自动生成" value="' + escapeHtml(f.tag || "") + '"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' +
+              '<input type="text" id="quick-commit-tag" class="field-input" placeholder="输入 tag 名称；留空则提交时由 AI 自动生成" value="' + escapeHtml(f.tag || "") + '"' + (state.quickCommitSubmitting ? ' disabled' : '') + '>' +
             '</div>' +
             (state.quickCommitError ? '<p class="error-message">' + escapeHtml(state.quickCommitError) + '</p>' : '') +
             '<div class="qc-section-actions">' +
@@ -3640,7 +3649,9 @@
         var visibleHistory = getClaudeHistoryRegionItems();
         var expanded = !!state.claudeHistoryExpanded;
         var loaded = !!state.claudeHistoryLoaded;
-        var count = loaded ? visibleHistory.length : 0;
+        var codexVisible = getVisibleCodexHistorySessions();
+        var codexLoaded = !!state.codexHistoryLoaded;
+        var count = (loaded ? visibleHistory.length : 0) + (codexLoaded ? codexVisible.length : 0);
 
         var badgeCls = "history-bubble";
         var badgeContent;
@@ -3666,7 +3677,7 @@
         '</button>';
 
         var body = expanded
-          ? '<div class="sidebar-history-body" id="sidebar-history-body">' + renderClaudeHistoryBodyContent(visibleHistory) + '</div>'
+          ? '<div class="sidebar-history-body" id="sidebar-history-body">' + renderClaudeHistoryBodyContent(visibleHistory) + renderCodexHistoryBodyContent(codexVisible) + '</div>'
           : '';
 
         return header + body;
@@ -3897,6 +3908,44 @@
         });
       }
 
+      function renderCodexHistoryDirectoryHeader(cwd, cwdShort, count, isExpanded) {
+        var chevron = isExpanded ? "\u25be" : "\u25b8";
+        return '<div class="claude-history-directory-header codex-history-directory-header" data-action="toggle-codex-history-directory" data-cwd="' + escapeHtml(cwd) + '" role="button" tabindex="0">' +
+          '<div class="session-group-title claude-history-directory-title">' +
+            '<span class="chevron">' + chevron + '</span>' +
+            '<span class="claude-history-directory-label">' + escapeHtml(cwdShort) + ' (' + count + ')</span>' +
+          '</div>' +
+        '</div>';
+      }
+
+      function renderCodexHistoryBodyContent(visibleHistory) {
+        if (!state.codexHistoryLoaded) {
+          return '<div class="claude-history-loading">\u626b\u63cf Codex \u5386\u53f2\u4f1a\u8bdd\u4e2d\u2026</div>';
+        }
+        if (visibleHistory.length === 0) {
+          return '';
+        }
+        var groups = {};
+        var groupOrder = [];
+        visibleHistory.forEach(function(s) {
+          if (!groups[s.cwd]) {
+            groups[s.cwd] = [];
+            groupOrder.push(s.cwd);
+          }
+          groups[s.cwd].push(s);
+        });
+        var listHtml = '<div class="sidebar-history-section-label">Codex</div>';
+        groupOrder.forEach(function(cwd) {
+          var cwdShort = cwd.split("/").filter(Boolean).slice(-3).join("/");
+          var isDirExpanded = !!state.codexHistoryExpandedDirs[cwd];
+          listHtml += renderCodexHistoryDirectoryHeader(cwd, cwdShort, groups[cwd].length, isDirExpanded);
+          if (isDirExpanded) {
+            listHtml += groups[cwd].map(function(session) { return renderClaudeHistoryItem(session, "codex"); }).join("");
+          }
+        });
+        return '<div class="sidebar-history-scroll codex-history-scroll">' + listHtml + '</div>';
+      }
+
       function renderClaudeHistoryDirectoryHeader(cwd, cwdShort, count, isExpanded) {
         var chevron = isExpanded ? "&#9662;" : "&#9656;";
         return '<div class="claude-history-directory-header" data-action="toggle-history-directory" data-cwd="' + escapeHtml(cwd) + '" role="button" tabindex="0">' +
@@ -3910,19 +3959,23 @@
       }
 
       function renderClaudeHistoryItem(session, kind) {
+        var isCodex = kind === "codex";
+        var rAct = isCodex ? "resume-codex-history" : "resume-history";
+        var dAct = isCodex ? "delete-codex-history" : "delete-history";
+        var selMap = isCodex ? state.selectedCodexHistoryIds : state.selectedClaudeHistoryIds;
         var shortId = session.claudeSessionId.slice(0, 8);
         var preview = session.firstUserMessage || "(空会话)";
         var timeStr = formatHistoryTime(session.timestamp);
         var checkbox = renderManageCheckbox(kind, session.claudeSessionId, "选择历史会话 " + preview);
         var deleteButton = state.sessionsManageMode ? '' :
-          '<button class="session-action-btn delete-btn" data-action="delete-history" data-claude-session-id="' +
+          '<button class="session-action-btn delete-btn" data-action="' + dAct + '" data-claude-session-id="' +
           session.claudeSessionId + '" type="button" aria-label="删除会话" title="隐藏此历史会话"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18"/><path d="M8 6V4a2 2 0 012-2h4a2 2 0 012 2v2"/><path d="M19 6l-1 14a2 2 0 01-2 2H8a2 2 0 01-2-2L5 6"/></svg></button>';
         var resumeButton = state.sessionsManageMode ? '' :
-          '<button class="session-action-btn" data-action="resume-history" data-claude-session-id="' +
+          '<button class="session-action-btn" data-action="' + rAct + '" data-claude-session-id="' +
           session.claudeSessionId + '" data-cwd="' + escapeHtml(session.cwd) +
-          '" type="button" aria-label="恢复会话" title="恢复此 Claude 历史会话"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 4v6h6"/><path d="M3.51 15a9 9 0 105.64-11.36L3 10"/></svg></button>';
+          '" type="button" aria-label="恢复会话" title="' + (isCodex ? "恢复此 Codex 历史会话" : "恢复此 Claude 历史会话") + '"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M1 4v6h6"/><path d="M3.51 15a9 9 0 105.64-11.36L3 10"/></svg></button>';
 
-        return '<div class="session-item claude-history-item' + (state.sessionsManageMode && state.selectedClaudeHistoryIds[session.claudeSessionId] ? ' selected' : '') + '" data-claude-history-id="' + session.claudeSessionId + '" data-cwd="' + escapeHtml(session.cwd) + '" role="button" tabindex="0">' +
+        return '<div class="session-item claude-history-item' + (state.sessionsManageMode && selMap[session.claudeSessionId] ? ' selected' : '') + '" data-claude-history-id="' + session.claudeSessionId + '" data-cwd="' + escapeHtml(session.cwd) + '" role="button" tabindex="0">' +
           '<div class="session-item-content">' +
             '<div class="session-item-row">' +
               checkbox +
@@ -3980,6 +4033,7 @@
       // 且在已加载时立即 resolve。
       var _claudeHistoryLoadingPromise = null;
       function ensureClaudeHistoryLoaded() {
+        ensureCodexHistoryLoaded();
         if (state.claudeHistoryLoaded) return Promise.resolve();
         if (_claudeHistoryLoadingPromise) return _claudeHistoryLoadingPromise;
         _claudeHistoryLoadingPromise = loadClaudeHistory().then(function() {
@@ -3990,6 +4044,46 @@
         return _claudeHistoryLoadingPromise;
       }
 
+      function loadCodexHistory() {
+        return fetch("/api/codex-history", { credentials: "same-origin" })
+          .then(function(res) {
+            if (!res.ok) return [];
+            return res.json();
+          })
+          .then(function(sessions) {
+            state.codexHistory = sessions || [];
+            state.codexHistoryLoaded = true;
+            updateSessionsList();
+          })
+          .catch(function() {
+            state.codexHistoryLoaded = true;
+            state.codexHistory = [];
+            updateSessionsList();
+          });
+      }
+
+      var _codexHistoryLoadingPromise = null;
+      function ensureCodexHistoryLoaded() {
+        if (state.codexHistoryLoaded) return Promise.resolve();
+        if (_codexHistoryLoadingPromise) return _codexHistoryLoadingPromise;
+        _codexHistoryLoadingPromise = loadCodexHistory().then(function() {
+          _codexHistoryLoadingPromise = null;
+        }, function() {
+          _codexHistoryLoadingPromise = null;
+        });
+        return _codexHistoryLoadingPromise;
+      }
+
+      function getVisibleCodexHistorySessions() {
+        var managedIds = new Set();
+        state.sessions.forEach(function(s) {
+          if (s.claudeSessionId) managedIds.add(s.claudeSessionId);
+        });
+        return state.codexHistory.filter(function(s) {
+          return s.hasConversation && !s.managedByWand && !managedIds.has(s.claudeSessionId);
+        });
+      }
+
       function isMobileLayout() {
         return window.innerWidth <= 768;
       }
@@ -7244,6 +7338,14 @@
             handleResumeAction(actionButton);
           } else if (actionButton.dataset.action === "resume-history" && actionButton.dataset.claudeSessionId) {
             handleResumeHistoryAction(actionButton);
+          } else if (actionButton.dataset.action === "resume-codex-history" && actionButton.dataset.claudeSessionId) {
+            handleResumeCodexHistoryAction(actionButton);
+          } else if (actionButton.dataset.action === "delete-codex-history" && actionButton.dataset.claudeSessionId) {
+            handleDeleteCodexHistoryAction(actionButton);
+          } else if (actionButton.dataset.action === "toggle-codex-history-directory" && actionButton.dataset.cwd) {
+            var codexDirCwd = actionButton.dataset.cwd;
+            state.codexHistoryExpandedDirs[codexDirCwd] = !state.codexHistoryExpandedDirs[codexDirCwd];
+            updateSessionsList();
           } else if (actionButton.dataset.action === "worktree-merge" && actionButton.dataset.sessionId) {
             openWorktreeMergeModal(actionButton.dataset.sessionId);
           } else if (actionButton.dataset.action === "worktree-cleanup" && actionButton.dataset.sessionId) {
@@ -14644,6 +14746,81 @@
           });
       }
 
+      function handleResumeCodexHistoryAction(actionButton) {
+        var threadId = actionButton.dataset.claudeSessionId;
+        var cwd = actionButton.dataset.cwd;
+        console.log("[WAND] handleResumeCodexHistoryAction threadId:", threadId, "cwd:", cwd);
+        if (!threadId) return;
+        actionButton.disabled = true;
+        resumeCodexHistorySession(threadId, cwd)
+          .then(function(data) {
+            if (data && data.id) {
+              state.codexHistory = state.codexHistory.filter(function(s) {
+                return s.claudeSessionId !== threadId;
+              });
+              state.selectedId = data.id;
+              persistSelectedId();
+              state.drafts[data.id] = "";
+              activateSession(data).then(function() {
+                dismissDrawerIfOverlay();
+              });
+            }
+          })
+          .finally(function() {
+            actionButton.disabled = false;
+          });
+      }
+
+      function resumeCodexHistorySession(threadId, cwd) {
+        return fetch("/api/codex-sessions/" + encodeURIComponent(threadId) + "/resume", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify(withTerminalDimensions({
+            mode: state.chatMode || (state.config && state.config.defaultMode) || "default",
+            cwd: cwd
+          }))
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          if (data.error) {
+            showToast(data.error, "error");
+            return null;
+          }
+          return data;
+        })
+        .catch(function(error) {
+          showToast((error && error.message) || "无法恢复历史会话。", "error");
+          return null;
+        });
+      }
+
+      function handleDeleteCodexHistoryAction(actionButton) {
+        var threadId = actionButton.dataset.claudeSessionId;
+        if (!threadId) return;
+        console.log("[WAND] handleDeleteCodexHistoryAction threadId:", threadId);
+        var item = actionButton.closest(".claude-history-item");
+        if (item) item.style.opacity = "0.5";
+        fetch("/api/codex-history/" + encodeURIComponent(threadId), {
+          method: "DELETE",
+          credentials: "same-origin"
+        })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && data.ok) {
+              state.codexHistory = state.codexHistory.filter(function(s) {
+                return s.claudeSessionId !== threadId;
+              });
+              updateSessionsList();
+            } else if (item) {
+              item.style.opacity = "1";
+            }
+          })
+          .catch(function() {
+            if (item) item.style.opacity = "1";
+          });
+      }
+
       function handleResumeHistoryAction(actionButton) {
         var claudeSessionId = actionButton.dataset.claudeSessionId;
         var cwd = actionButton.dataset.cwd;

package/dist/web-ui/content/styles.css

@@ -1351,6 +1351,14 @@
       text-align: center;
       font-style: italic;
     }
+    .sidebar-history-section-label {
+      padding: 8px 10px 4px 10px;
+      font-size: 0.6875rem;
+      font-weight: 600;
+      letter-spacing: 0.04em;
+      text-transform: uppercase;
+      opacity: 0.5;
+    }
     .claude-history-directory-header {
       margin-top: 6px;
       cursor: pointer;
@@ -15373,39 +15381,10 @@
       letter-spacing: 0.02em;
       white-space: nowrap;
     }
-    /* Switch row inside quick-commit modal — same iOS rhythm as settings */
-    .qc-checkbox-row {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      gap: 12px;
-      padding: 11px 14px;
-      background: rgba(255, 255, 255, 0.55);
-      border: 1px solid rgba(125, 91, 57, 0.08);
-      border-radius: 12px;
-      box-shadow: 0 1px 1px rgba(125, 91, 57, 0.02);
-      transition: background 0.16s ease, border-color 0.16s ease;
-      user-select: none;
-    }
-    .qc-checkbox-row:hover {
-      background: rgba(255, 255, 255, 0.78);
-      border-color: rgba(125, 91, 57, 0.16);
-    }
-    .qc-checkbox-row:has(.switch-toggle:checked) {
-      background: linear-gradient(180deg, #fff7ef 0%, #fff1de 100%);
-      border-color: rgba(197, 101, 61, 0.3);
-    }
-    .qc-checkbox-label {
-      flex: 1;
-      min-width: 0;
-      font-size: 0.8125rem;
-      font-weight: 600;
-      color: var(--text-primary);
-      cursor: pointer;
-      line-height: 1.4;
-    }
     .qc-switch {
       flex-shrink: 0;
+      display: inline-flex;
+      align-items: center;
       cursor: pointer;
     }
     .qc-message-row,
@@ -15423,6 +15402,62 @@
       align-items: center;
       justify-content: space-between;
       gap: 8px;
+      flex-wrap: wrap;
+    }
+    .qc-ai-controls {
+      display: inline-flex;
+      align-items: center;
+      justify-content: flex-end;
+      gap: 7px;
+      margin-left: auto;
+      flex: 0 0 auto;
+    }
+    .qc-ai-tag-toggle {
+      display: inline-flex;
+      align-items: center;
+      gap: 6px;
+      min-height: 30px;
+      padding: 3px 7px 3px 9px;
+      border: 1px solid rgba(125, 91, 57, 0.12);
+      border-radius: 999px;
+      background: rgba(255, 255, 255, 0.58);
+      color: var(--text-muted);
+      font-size: 0.74rem;
+      font-weight: 700;
+      line-height: 1;
+      user-select: none;
+      cursor: pointer;
+      transition: background 0.16s ease, border-color 0.16s ease, color 0.16s ease, box-shadow 0.16s ease;
+    }
+    .qc-ai-tag-toggle:hover {
+      background: rgba(255, 255, 255, 0.82);
+      border-color: rgba(125, 91, 57, 0.20);
+    }
+    .qc-ai-tag-toggle:has(.switch-toggle:checked) {
+      color: rgba(170, 79, 42, 0.98);
+      background: linear-gradient(180deg, #fff8f1 0%, #fff1e3 100%);
+      border-color: rgba(197, 101, 61, 0.32);
+      box-shadow: 0 1px 4px rgba(197, 101, 61, 0.10);
+    }
+    .qc-ai-tag-toggle:has(.switch-toggle:disabled) {
+      cursor: default;
+      opacity: 0.68;
+    }
+    .qc-ai-tag-label {
+      white-space: nowrap;
+    }
+    .qc-switch--compact .switch-slider {
+      width: 34px;
+      min-width: 34px;
+      height: 20px;
+      border-radius: 999px;
+    }
+    .qc-switch--compact .switch-slider::after {
+      width: 16px;
+      height: 16px;
+    }
+    .qc-switch--compact .switch-toggle:checked + .switch-slider::after {
+      transform: translateX(14px);
     }
     .qc-message-row textarea {
       resize: vertical;
@@ -15727,6 +15762,10 @@
       .qc-files-wrap { max-height: 160px; }
       .qc-section { padding: 10px 12px; }
       .qc-dropdown-menu { min-width: 180px; }
+      .qc-ai-controls {
+        width: 100%;
+        justify-content: flex-end;
+      }
     }
 
     /* ============================================================ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.37.0",
+  "version": "1.39.0",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {