@co0ontty/wand 4.12.1 → 4.13.0

package/README.md

@@ -57,7 +57,7 @@ wand config:password
 
 - **Dual view modes** — switch between raw terminal output and a structured conversation view for the same session
 - **Multiple providers** — create PTY or structured sessions for Claude Code, Codex, OpenCode, Grok, and Qoder CLI
-- **Session management** — create, archive, and resume sessions; restore Claude native history; show summaries in the session list
+- **Session management** — create, archive, and resume Claude, Codex, OpenCode, Grok, and Qoder sessions with their provider-native context; restore Claude/Codex native history; show summaries in the session list
 - **Permission control** — visual permission prompts with one-time approval, per-turn memory, and related policies
 
 #### Experience
@@ -206,7 +206,7 @@ npm install -g opencode-ai@latest
 
 - **双视图模式** — 终端原始输出和结构化对话视图可随时切换，同一会话两种呈现
 - **多 Provider 支持** — Claude Code、Codex、OpenCode、Grok 和 Qoder CLI 均可创建 PTY 或结构化会话
-- **会话管理** — 创建、归档、恢复会话；支持从 Claude 原生历史记录恢复；会话列表显示摘要
+- **会话管理** — 创建、归档并携带原生上下文恢复 Claude、Codex、OpenCode、Grok、Qoder 会话；支持恢复 Claude/Codex 原生历史记录；会话列表显示摘要
 - **权限控制** — 可视化权限提示，支持逐次确认、单次批准、本轮记忆等策略
 
 #### 交互体验

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "86478ad79b23b328b962d8e7bc77ee3b4b021ef1",
-  "builtAt": "2026-07-17T11:42:28.086Z",
-  "version": "4.12.1",
+  "commit": "95fe372be4bebb2e489b287ddc8de993291d390c",
+  "builtAt": "2026-07-17T21:08:20.623Z",
+  "version": "4.13.0",
   "channel": "stable"
 }

package/dist/git-quick-commit.js

@@ -1262,14 +1262,22 @@ async function runQuickCommitFallbackCli(opts, priorError) {
         });
     }
     else {
-        const args = ["-p", "--verbose", "--output-format", "stream-json"];
+        const args = [
+            "-p",
+            "--verbose",
+            "--output-format",
+            "stream-json",
+            "--tools",
+            "Bash",
+            "--allowedTools",
+            "Bash(git *)",
+        ];
         const model = opts.model?.trim();
         if (model && model !== "default")
             args.push("--model", model);
         const claudeEffort = thinkingEffortToClaudeCliEffort(opts.thinkingEffort ?? "off");
         if (claudeEffort)
             args.push("--effort", claudeEffort);
-        args.push("--permission-mode", "bypassPermissions");
         await runCliText("claude", args, prompt, {
             cwd: opts.cwd,
             timeoutMs: QUICK_COMMIT_CLI_TIMEOUT_MS,

package/dist/process-manager.d.ts

@@ -65,6 +65,7 @@ export declare class ProcessManager extends EventEmitter {
     hasCodexSessionFile(threadId: string): boolean;
     deleteCodexHistoryFiles(threadIds: string[]): number;
     private captureCodexSessionId;
+    private captureOpenCodeSessionId;
     private captureClaudeSessionId;
     get(id: string): SessionSnapshot | null;
     /** Return only a session owned by this manager, without the SQLite fallback used by get(). */

package/dist/process-manager.js

@@ -4,6 +4,7 @@ import { existsSync, unlinkSync, rmSync, readFileSync, readdirSync, statSync } f
 import path from "node:path";
 import process from "node:process";
 import os from "node:os";
+import { DatabaseSync } from "node:sqlite";
 import pty from "node-pty";
 import { SessionLogger } from "./session-logger.js";
 import { ClaudePtyBridge } from "./claude-pty-bridge.js";
@@ -13,7 +14,7 @@ import { buildChildEnv, isRunningAsRoot } from "./env-utils.js";
 import { ensureNodePtyHelperExecutable } from "./ensure-node-pty-helper.js";
 import { buildLanguageDirective, buildManagedAutonomyDirective } from "./language-prompt.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
-import { getCodexResumeCommandSessionId, getResumeCommandSessionId } from "./resume-policy.js";
+import { getProviderCommandSessionId, getProviderResumeCommandSessionId } from "./resume-policy.js";
 import { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant } from "./structured-provider-common.js";
 import { generateSessionTopic } from "./session-topic.js";
 import { getErrorMessage } from "./error-utils.js";
@@ -354,6 +355,72 @@ function selectCodexSessionForRecord(record, sessions) {
 function getLatestCodexSessionId(record, sessions) {
     return selectCodexSessionForRecord(record, sessions)?.claudeSessionId ?? null;
 }
+function getOpenCodeDatabasePath() {
+    const dataHome = process.env.XDG_DATA_HOME?.trim() || path.join(os.homedir(), ".local", "share");
+    return path.join(dataHome, "opencode", "opencode.db");
+}
+function listOpenCodeSessionCandidates() {
+    const dbPath = getOpenCodeDatabasePath();
+    if (!existsSync(dbPath))
+        return [];
+    let db = null;
+    try {
+        db = new DatabaseSync(dbPath, { readOnly: true });
+        const rows = db.prepare("SELECT id, directory, time_created, time_updated FROM session ORDER BY time_updated DESC LIMIT 500").all();
+        return rows.flatMap((row) => {
+            if (typeof row.id !== "string" || typeof row.directory !== "string")
+                return [];
+            const createdAtMs = Number(row.time_created);
+            const updatedAtMs = Number(row.time_updated);
+            if (!Number.isFinite(createdAtMs) || !Number.isFinite(updatedAtMs))
+                return [];
+            return [{ id: row.id, cwd: row.directory, createdAtMs, updatedAtMs }];
+        });
+    }
+    catch {
+        return [];
+    }
+    finally {
+        try {
+            db?.close();
+        }
+        catch { /* best-effort read-only probe */ }
+    }
+}
+function listOpenCodeSessionMtimes() {
+    return new Map(listOpenCodeSessionCandidates().map((session) => [session.id, session.updatedAtMs]));
+}
+function selectOpenCodeSessionForRecord(record) {
+    const known = record.knownOpenCodeSessionMtimes ?? new Map();
+    const startedAtMs = Date.parse(record.startedAt);
+    const candidates = listOpenCodeSessionCandidates()
+        .filter((session) => isSameResolvedPath(session.cwd, record.cwd))
+        .filter((session) => {
+        const previous = known.get(session.id);
+        return previous === undefined || session.updatedAtMs > previous;
+    })
+        .filter((session) => !Number.isFinite(startedAtMs) || session.updatedAtMs >= startedAtMs - START_TIME_SKEW_MS)
+        .sort((left, right) => right.updatedAtMs - left.updatedAtMs);
+    if (candidates.length === 0)
+        return null;
+    const fresh = candidates.filter((session) => !known.has(session.id));
+    if (fresh.length === 1)
+        return fresh[0];
+    return null;
+}
+function selectOpenCodeSessionForTimeWindow(record) {
+    const startedAtMs = Date.parse(record.startedAt);
+    if (!Number.isFinite(startedAtMs))
+        return null;
+    const endedAtMs = Date.parse(record.endedAt ?? "");
+    const windowEnd = (Number.isFinite(endedAtMs) ? endedAtMs : Date.now()) + START_TIME_SKEW_MS;
+    const candidates = listOpenCodeSessionCandidates()
+        .filter((session) => isSameResolvedPath(session.cwd, record.cwd))
+        .filter((session) => session.updatedAtMs >= startedAtMs - START_TIME_SKEW_MS && session.updatedAtMs <= windowEnd)
+        .filter((session) => session.createdAtMs <= windowEnd)
+        .sort((left, right) => right.updatedAtMs - left.updatedAtMs);
+    return candidates.length === 1 ? candidates[0] : null;
+}
 function selectCodexSessionForTimeWindow(record, sessions) {
     const startedAtMs = parseTimeMs(record.startedAt);
     if (startedAtMs === null)
@@ -382,13 +449,13 @@ function recoverCodexSessionIdFromHistory(snapshot, sessions) {
     if (snapshot.provider !== "codex" || snapshot.claudeSessionId) {
         return null;
     }
-    return getCodexResumeCommandSessionId(snapshot.command) ?? selectCodexSessionForTimeWindow(snapshot, sessions)?.claudeSessionId ?? null;
+    return getProviderResumeCommandSessionId("codex", snapshot.command) ?? selectCodexSessionForTimeWindow(snapshot, sessions)?.claudeSessionId ?? null;
 }
 function recoverClaudeSessionIdFromHistory(snapshot) {
     if (snapshot.provider !== "claude" || snapshot.claudeSessionId) {
         return null;
     }
-    return getResumeCommandSessionId(snapshot.command) ?? selectClaudeProjectSessionForTimeWindow(snapshot)?.id ?? null;
+    return getProviderResumeCommandSessionId("claude", snapshot.command) ?? selectClaudeProjectSessionForTimeWindow(snapshot)?.id ?? null;
 }
 function snapshotMessages(record) {
     return record.ptyBridge?.getMessages() ?? record.messages;
@@ -482,11 +549,8 @@ export class ProcessManager extends EventEmitter {
             const provider = snapshot.provider ?? resolveProviderFromCommand(snapshot.command);
             const isClaudeCmd = provider === "claude";
             const isCodexCmd = provider === "codex";
-            const resumeCommandSessionId = isClaudeCmd
-                ? getResumeCommandSessionId(snapshot.command)
-                : isCodexCmd
-                    ? getCodexResumeCommandSessionId(snapshot.command)
-                    : null;
+            const isOpenCodeCmd = provider === "opencode";
+            const resumeCommandSessionId = getProviderCommandSessionId(provider, snapshot.command);
             const orphanEndedAt = snapshot.status === "running" ? new Date().toISOString() : null;
             const sessionIdFromHistory = isClaudeCmd
                 ? recoverClaudeSessionIdFromHistory({
@@ -500,7 +564,13 @@ export class ProcessManager extends EventEmitter {
                         provider: "codex",
                         endedAt: snapshot.endedAt ?? orphanEndedAt,
                     }, getStartupCodexHistory())
-                    : null;
+                    : isOpenCodeCmd
+                        ? selectOpenCodeSessionForTimeWindow({
+                            cwd: snapshot.cwd,
+                            startedAt: snapshot.startedAt,
+                            endedAt: snapshot.endedAt ?? orphanEndedAt,
+                        })?.id ?? null
+                        : null;
             const restoredSessionId = resumeCommandSessionId ?? snapshot.claudeSessionId ?? sessionIdFromHistory;
             // Sessions restored from storage have ptyProcess: null — the old server's PTY
             // belongs to a dead process. Mark running sessions as exited so the UI
@@ -517,7 +587,7 @@ export class ProcessManager extends EventEmitter {
                 };
                 this.storage.saveSession(updated);
                 if (restoredSessionId && restoredSessionId !== snapshot.claudeSessionId) {
-                    const label = isCodexCmd ? "Codex thread" : "Claude session";
+                    const label = isCodexCmd ? "Codex thread" : isOpenCodeCmd ? "OpenCode session" : "Claude session";
                     process.stderr.write(`[wand] Recovered ${label} ID for orphan PTY ${snapshot.id}: ${restoredSessionId}\n`);
                 }
                 this.sessions.set(snapshot.id, {
@@ -550,6 +620,8 @@ export class ProcessManager extends EventEmitter {
                     knownClaudeProjectMtimes: isClaudeCmd ? listClaudeProjectSessionMtimes(updated.cwd) : undefined,
                     knownCodexSessionMtimes: isCodexCmd ? listCodexSessionMtimes(getStartupCodexHistory()) : undefined,
                     codexSessionDiscoveryTimer: null,
+                    knownOpenCodeSessionMtimes: isOpenCodeCmd ? listOpenCodeSessionMtimes() : undefined,
+                    openCodeSessionDiscoveryTimer: null,
                     claudeSessionId: restoredSessionId ?? updated.claudeSessionId,
                     approvalStats: snapshot.approvalStats ?? { tool: 0, command: 0, file: 0, total: 0 },
                     ptyCols: snapshot.ptyCols ?? 120,
@@ -563,7 +635,7 @@ export class ProcessManager extends EventEmitter {
                     : snapshot;
                 if (updated !== snapshot) {
                     this.storage.saveSessionMetadata(updated);
-                    const label = isCodexCmd ? "Codex thread" : "Claude session";
+                    const label = isCodexCmd ? "Codex thread" : isOpenCodeCmd ? "OpenCode session" : "Claude session";
                     process.stderr.write(`[wand] Recovered ${label} ID for saved PTY ${snapshot.id}: ${restoredSessionId}\n`);
                 }
                 this.sessions.set(snapshot.id, {
@@ -593,6 +665,8 @@ export class ProcessManager extends EventEmitter {
                     knownClaudeProjectMtimes: isClaudeCmd ? listClaudeProjectSessionMtimes(updated.cwd) : undefined,
                     knownCodexSessionMtimes: isCodexCmd ? listCodexSessionMtimes(getStartupCodexHistory()) : undefined,
                     codexSessionDiscoveryTimer: null,
+                    knownOpenCodeSessionMtimes: isOpenCodeCmd ? listOpenCodeSessionMtimes() : undefined,
+                    openCodeSessionDiscoveryTimer: null,
                     claudeSessionId: restoredSessionId ?? updated.claudeSessionId,
                     approvalStats: snapshot.approvalStats ?? { tool: 0, command: 0, file: 0, total: 0 },
                     ptyCols: snapshot.ptyCols ?? 120,
@@ -744,22 +818,29 @@ export class ProcessManager extends EventEmitter {
         const isClaudeProvider = provider === "claude";
         const selectedModel = opts?.model?.trim() || undefined;
         const initialThinkingEffort = normalizeThinkingEffort(opts?.thinkingEffort);
-        const processedCommand = this.processCommandForMode(command, effectiveMode, provider, selectedModel, initialThinkingEffort);
-        const resumeCommandSessionId = isClaudeProvider
-            ? getResumeCommandSessionId(processedCommand) ?? getResumeCommandSessionId(command)
-            : null;
+        let processedCommand = this.processCommandForMode(command, effectiveMode, provider, selectedModel, initialThinkingEffort);
         const isCodexProvider = provider === "codex";
-        const codexResumeCommandSessionId = isCodexProvider
-            ? getCodexResumeCommandSessionId(processedCommand) ?? getCodexResumeCommandSessionId(command)
+        const isOpenCodeProvider = provider === "opencode";
+        const existingProviderSessionId = getProviderCommandSessionId(provider, processedCommand)
+            ?? getProviderCommandSessionId(provider, command);
+        // Grok and Qoder accept caller-selected IDs for new conversations. Assigning
+        // one up front avoids depending on provider-specific TUI rendering to learn
+        // the durable ID later.
+        const assignedProviderSessionId = !existingProviderSessionId && (provider === "grok" || provider === "qoder")
+            ? randomUUID()
             : null;
+        if (assignedProviderSessionId) {
+            processedCommand = `${processedCommand} --session-id ${assignedProviderSessionId}`;
+        }
         const knownClaudeTaskIds = isClaudeProvider ? new Set(listRecentClaudeProjectSessionIds(resolvedCwd, new Date().toISOString())) : null;
         const knownClaudeProjectMtimes = isClaudeProvider ? listClaudeProjectSessionMtimes(resolvedCwd) : null;
-        const knownCodexSessionMtimes = isCodexProvider && !codexResumeCommandSessionId
+        const knownCodexSessionMtimes = isCodexProvider && !existingProviderSessionId
             ? listCodexSessionMtimes(this.providerHistory.listCodexHistorySessions())
             : null;
-        const initialClaudeSessionId = isClaudeProvider
-            ? resumeCommandSessionId ?? null
-            : codexResumeCommandSessionId ?? null;
+        const knownOpenCodeSessionMtimes = isOpenCodeProvider && !existingProviderSessionId
+            ? listOpenCodeSessionMtimes()
+            : null;
+        const initialClaudeSessionId = existingProviderSessionId ?? assignedProviderSessionId;
         const startedAt = new Date().toISOString();
         const record = {
             id,
@@ -805,6 +886,8 @@ export class ProcessManager extends EventEmitter {
             knownClaudeProjectMtimes: knownClaudeProjectMtimes ?? undefined,
             knownCodexSessionMtimes: knownCodexSessionMtimes ?? undefined,
             codexSessionDiscoveryTimer: null,
+            knownOpenCodeSessionMtimes: knownOpenCodeSessionMtimes ?? undefined,
+            openCodeSessionDiscoveryTimer: null,
             approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
             selectedModel: selectedModel ?? null,
             thinkingEffort: initialThinkingEffort,
@@ -829,13 +912,8 @@ export class ProcessManager extends EventEmitter {
         }
         this.sessions.set(id, record);
         this.persist(record, { forceFullSave: true });
-        if (initialClaudeSessionId) {
-            if (provider === "codex") {
-                this.providerHistory.invalidate("codex");
-            }
-            else {
-                this.providerHistory.invalidate("claude");
-            }
+        if (initialClaudeSessionId && (provider === "claude" || provider === "codex")) {
+            this.providerHistory.invalidate(provider);
         }
         this.cleanupOldSessions();
         const shellArgs = this.buildShellArgs(processedCommand);
@@ -886,6 +964,10 @@ export class ProcessManager extends EventEmitter {
                 clearTimeout(current.codexSessionDiscoveryTimer);
                 current.codexSessionDiscoveryTimer = null;
             }
+            if (current.openCodeSessionDiscoveryTimer) {
+                clearTimeout(current.openCodeSessionDiscoveryTimer);
+                current.openCodeSessionDiscoveryTimer = null;
+            }
             if (current.initialInputTimer) {
                 clearTimeout(current.initialInputTimer);
                 current.initialInputTimer = null;
@@ -898,6 +980,7 @@ export class ProcessManager extends EventEmitter {
             current.ptyPermissionBlocked = false;
             this.captureClaudeSessionId(current, { allowTimeWindowFallback: true });
             this.captureCodexSessionId(current, { allowTimeWindowFallback: true });
+            this.captureOpenCodeSessionId(current, { allowTimeWindowFallback: true });
             current.status = current.stopRequested ? "stopped" : exitCode === 0 ? "exited" : "failed";
             current.exitCode = current.stopRequested ? null : exitCode;
             current.endedAt = new Date().toISOString();
@@ -1003,7 +1086,7 @@ export class ProcessManager extends EventEmitter {
                 if (current !== record || current.ptyProcess !== child || current.status !== "running" || current.claudeSessionId || !current.knownClaudeTaskIds) {
                     return;
                 }
-                if (getResumeCommandSessionId(current.command)) {
+                if (getProviderResumeCommandSessionId("claude", current.command)) {
                     current.claudeTaskDiscoveryTimer = null;
                     return;
                 }
@@ -1034,7 +1117,7 @@ export class ProcessManager extends EventEmitter {
                 if (current !== record || current.ptyProcess !== child || current.status !== "running" || current.claudeSessionId || !current.knownCodexSessionMtimes) {
                     return;
                 }
-                if (getCodexResumeCommandSessionId(current.command)) {
+                if (getProviderResumeCommandSessionId("codex", current.command)) {
                     current.codexSessionDiscoveryTimer = null;
                     return;
                 }
@@ -1047,6 +1130,29 @@ export class ProcessManager extends EventEmitter {
             };
             record.codexSessionDiscoveryTimer = setTimeout(tryDiscoverCodexSessionId, 500);
         }
+        if (record.knownOpenCodeSessionMtimes) {
+            const tryDiscoverOpenCodeSessionId = () => {
+                if (this.disposed)
+                    return;
+                const current = this.sessions.get(id);
+                if (current !== record || current.ptyProcess !== child || current.status !== "running" || current.claudeSessionId || !current.knownOpenCodeSessionMtimes) {
+                    return;
+                }
+                if (getProviderResumeCommandSessionId("opencode", current.command)) {
+                    current.openCodeSessionDiscoveryTimer = null;
+                    return;
+                }
+                if (this.captureOpenCodeSessionId(current)) {
+                    current.openCodeSessionDiscoveryTimer = null;
+                    this.persist(current);
+                    return;
+                }
+                current.openCodeSessionDiscoveryTimer = setTimeout(tryDiscoverOpenCodeSessionId, 1000);
+                current.openCodeSessionDiscoveryTimer.unref?.();
+            };
+            record.openCodeSessionDiscoveryTimer = setTimeout(tryDiscoverOpenCodeSessionId, 500);
+            record.openCodeSessionDiscoveryTimer.unref?.();
+        }
         return this.snapshot(record);
     }
     list() {
@@ -1130,6 +1236,25 @@ export class ProcessManager extends EventEmitter {
         process.stderr.write(`[wand] Captured Codex thread ID: ${threadId}\n`);
         return true;
     }
+    captureOpenCodeSessionId(record, options) {
+        if (record.provider !== "opencode" || record.claudeSessionId)
+            return false;
+        const discovered = record.knownOpenCodeSessionMtimes
+            ? selectOpenCodeSessionForRecord(record)
+            : null;
+        const fallback = discovered
+            ? null
+            : options?.allowTimeWindowFallback
+                ? selectOpenCodeSessionForTimeWindow(record)
+                : null;
+        const providerSessionId = discovered?.id ?? fallback?.id ?? null;
+        if (!providerSessionId)
+            return false;
+        record.claudeSessionId = providerSessionId;
+        record.knownOpenCodeSessionMtimes?.set(providerSessionId, discovered?.updatedAtMs ?? fallback?.updatedAtMs ?? Date.now());
+        process.stderr.write(`[wand] Captured OpenCode session ID: ${providerSessionId}\n`);
+        return true;
+    }
     captureClaudeSessionId(record, options) {
         if (record.provider !== "claude" || record.claudeSessionId) {
             return false;
@@ -1307,6 +1432,10 @@ export class ProcessManager extends EventEmitter {
             clearTimeout(record.codexSessionDiscoveryTimer);
             record.codexSessionDiscoveryTimer = null;
         }
+        if (record.openCodeSessionDiscoveryTimer) {
+            clearTimeout(record.openCodeSessionDiscoveryTimer);
+            record.openCodeSessionDiscoveryTimer = null;
+        }
         if (record.initialInputTimer) {
             clearTimeout(record.initialInputTimer);
             record.initialInputTimer = null;
@@ -1333,6 +1462,7 @@ export class ProcessManager extends EventEmitter {
         // discovery can still inspect the latest parsed turns.
         this.captureClaudeSessionId(record, { allowTimeWindowFallback: true });
         this.captureCodexSessionId(record, { allowTimeWindowFallback: true });
+        this.captureOpenCodeSessionId(record, { allowTimeWindowFallback: true });
         if (record.ptyBridge) {
             record.messages = record.ptyBridge.getMessages();
             record.ptyBridge.removeAllListeners();
@@ -1350,6 +1480,10 @@ export class ProcessManager extends EventEmitter {
             clearTimeout(record.codexSessionDiscoveryTimer);
             record.codexSessionDiscoveryTimer = null;
         }
+        if (record.openCodeSessionDiscoveryTimer) {
+            clearTimeout(record.openCodeSessionDiscoveryTimer);
+            record.openCodeSessionDiscoveryTimer = null;
+        }
         if (record.initialInputTimer) {
             clearTimeout(record.initialInputTimer);
             record.initialInputTimer = null;
@@ -1388,6 +1522,10 @@ export class ProcessManager extends EventEmitter {
             clearTimeout(record.codexSessionDiscoveryTimer);
             record.codexSessionDiscoveryTimer = null;
         }
+        if (record.openCodeSessionDiscoveryTimer) {
+            clearTimeout(record.openCodeSessionDiscoveryTimer);
+            record.openCodeSessionDiscoveryTimer = null;
+        }
         if (record.initialInputTimer) {
             clearTimeout(record.initialInputTimer);
             record.initialInputTimer = null;

package/dist/resume-policy.d.ts

@@ -1,4 +1,16 @@
+import type { SessionProvider } from "./types.js";
 /** Claude session IDs and Codex thread IDs are UUID-shaped identifiers. */
 export declare function isProviderSessionId(value: unknown): value is string;
 export declare function getResumeCommandSessionId(command: string): string | null;
 export declare function getCodexResumeCommandSessionId(command: string): string | null;
+/**
+ * Provider-native IDs are not uniformly UUIDs: OpenCode uses `ses_*` and
+ * older Qoder releases also emitted `qs_*`. Keep the accepted alphabet shell
+ * inert before an ID is interpolated into a PTY command.
+ */
+export declare function isSafeProviderSessionId(value: unknown): value is string;
+export declare function getProviderResumeCommandSessionId(provider: SessionProvider, command: string): string | null;
+/** Read either a resume ID or a caller-assigned ID from a provider command. */
+export declare function getProviderCommandSessionId(provider: SessionProvider, command: string): string | null;
+/** Build the interactive resume command used by PTY sessions. */
+export declare function buildProviderResumeCommand(provider: SessionProvider, command: string, providerSessionId: string): string;

package/dist/resume-policy.js

@@ -2,6 +2,8 @@ const UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{1
 const PROVIDER_SESSION_ID_PATTERN = new RegExp(`^${UUID_PATTERN}$`, "i");
 const RESUME_COMMAND_ID_PATTERN = new RegExp(`(?:^|\\s)--resume\\s+(${UUID_PATTERN})(?:\\s|$)`, "i");
 const CODEX_RESUME_COMMAND_ID_PATTERN = new RegExp(`(?:^|\\s)resume\\s+(${UUID_PATTERN})(?:\\s|$)`, "i");
+const SAFE_PROVIDER_SESSION_ID_PATTERN = /^[a-z0-9][a-z0-9._:-]{0,199}$/i;
+const SAFE_PROVIDER_SESSION_ID_SOURCE = "([a-z0-9][a-z0-9._:-]{0,199})";
 /** Claude session IDs and Codex thread IDs are UUID-shaped identifiers. */
 export function isProviderSessionId(value) {
     return typeof value === "string" && PROVIDER_SESSION_ID_PATTERN.test(value);
@@ -14,3 +16,54 @@ export function getCodexResumeCommandSessionId(command) {
     const match = CODEX_RESUME_COMMAND_ID_PATTERN.exec(command);
     return match?.[1] ?? null;
 }
+/**
+ * Provider-native IDs are not uniformly UUIDs: OpenCode uses `ses_*` and
+ * older Qoder releases also emitted `qs_*`. Keep the accepted alphabet shell
+ * inert before an ID is interpolated into a PTY command.
+ */
+export function isSafeProviderSessionId(value) {
+    return typeof value === "string" && SAFE_PROVIDER_SESSION_ID_PATTERN.test(value);
+}
+function resumeArgumentPattern(provider) {
+    if (provider === "codex") {
+        return new RegExp(`(?:^|\\s)resume\\s+${SAFE_PROVIDER_SESSION_ID_SOURCE}(?=\\s|$)`, "i");
+    }
+    if (provider === "opencode") {
+        return new RegExp(`(?:^|\\s)(?:--session|-s)\\s+${SAFE_PROVIDER_SESSION_ID_SOURCE}(?=\\s|$)`, "i");
+    }
+    return new RegExp(`(?:^|\\s)(?:--resume|-r)\\s+${SAFE_PROVIDER_SESSION_ID_SOURCE}(?=\\s|$)`, "i");
+}
+function assignedSessionIdPattern() {
+    return new RegExp(`(?:^|\\s)--session-id\\s+${SAFE_PROVIDER_SESSION_ID_SOURCE}(?=\\s|$)`, "i");
+}
+export function getProviderResumeCommandSessionId(provider, command) {
+    return resumeArgumentPattern(provider).exec(command)?.[1] ?? null;
+}
+/** Read either a resume ID or a caller-assigned ID from a provider command. */
+export function getProviderCommandSessionId(provider, command) {
+    const resumed = getProviderResumeCommandSessionId(provider, command);
+    if (resumed)
+        return resumed;
+    if (provider === "codex" || provider === "opencode")
+        return null;
+    return assignedSessionIdPattern().exec(command)?.[1] ?? null;
+}
+function stripProviderResumeArgument(provider, command) {
+    const withoutResume = command.replace(resumeArgumentPattern(provider), " ");
+    const withoutAssignedId = provider === "codex" || provider === "opencode"
+        ? withoutResume
+        : withoutResume.replace(assignedSessionIdPattern(), " ");
+    return withoutAssignedId.replace(/\s+/g, " ").trim();
+}
+/** Build the interactive resume command used by PTY sessions. */
+export function buildProviderResumeCommand(provider, command, providerSessionId) {
+    if (!isSafeProviderSessionId(providerSessionId)) {
+        throw new Error("Provider 会话 ID 格式无效。");
+    }
+    const base = stripProviderResumeArgument(provider, command) || (provider === "qoder" ? "qodercli" : provider);
+    if (provider === "codex")
+        return `${base} resume ${providerSessionId}`;
+    if (provider === "opencode")
+        return `${base} --session ${providerSessionId}`;
+    return `${base} --resume ${providerSessionId}`;
+}

package/dist/server-session-routes.js

@@ -7,7 +7,7 @@ import { resolveSessionCwd } from "./session-cwd.js";
 import { resolveCommitAiContext } from "./session-ai-context.js";
 import { getGitStatusAsync, QuickCommitError, runQuickCommitWithFallback, runTagHead, runPush, generateCommitMessageOnly, } from "./git-quick-commit.js";
 import { getErrorMessage } from "./error-utils.js";
-import { isProviderSessionId } from "./resume-policy.js";
+import { buildProviderResumeCommand, isProviderSessionId } from "./resume-policy.js";
 import { parseBoundedInteger } from "./request-limits.js";
 import { asyncRoute } from "./express-async.js";
 import { enrichStructuredMessages, WAND_PROTOCOL_VERSION } from "./structured-client-protocol.js";
@@ -231,19 +231,23 @@ function getWorktreeMergePayload(error, fallback) {
         result: null,
     };
 }
-function buildCodexResumeCommand(command, threadId) {
-    const trimmed = command.trim();
-    const withoutExistingResume = trimmed
-        .replace(/\s+resume\s+[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(?:\s|$)/i, " ")
-        .trim();
-    return `${withoutExistingResume || "codex"} resume ${threadId}`;
-}
 function resolvePtyResumeProvider(snapshot) {
-    const provider = snapshot.provider ?? (/^codex\b/.test(snapshot.command.trim()) ? "codex" : "claude");
-    if (provider !== "claude" && provider !== "codex") {
-        throw new Error("只有 Claude 或 Codex provider 支持恢复功能。");
-    }
-    return provider;
+    if (snapshot.provider)
+        return snapshot.provider;
+    const command = snapshot.command.trim();
+    if (/^codex\b/.test(command))
+        return "codex";
+    if (/^opencode\b/.test(command))
+        return "opencode";
+    if (/^grok\b/.test(command))
+        return "grok";
+    if (/^qodercli\b/.test(command))
+        return "qoder";
+    return "claude";
+}
+function isPtyProviderCommand(provider, command) {
+    const executable = provider === "qoder" ? "qodercli" : provider;
+    return new RegExp(`^${executable}\\b`, "i").test(command.trim());
 }
 function startResumedPtySession(processes, existingSession, sessionId, defaultMode, body, initialInput) {
     if ((existingSession.sessionKind ?? "pty") !== "pty") {
@@ -253,23 +257,18 @@ function startResumedPtySession(processes, existingSession, sessionId, defaultMo
     const provider = resolvePtyResumeProvider(existingSession);
     const resumeSessionId = existingSession.claudeSessionId;
     if (!resumeSessionId) {
-        throw new Error(provider === "codex" ? "此会话没有 Codex thread ID，无法恢复。" : "此会话没有 Claude 会话 ID，无法恢复。");
+        throw new Error(`此会话没有 ${provider} 会话 ID，无法恢复。`);
     }
-    if (provider === "claude" && !/^claude\b/.test(command)) {
-        throw new Error("只有 Claude 命令支持恢复功能。");
+    if (!isPtyProviderCommand(provider, command)) {
+        throw new Error(`当前命令不是 ${provider} CLI，无法恢复。`);
     }
     if (provider === "codex") {
-        if (!/^codex\b/.test(command)) {
-            throw new Error("只有 Codex 命令支持恢复功能。");
-        }
         if (!processes.hasCodexSessionFile(resumeSessionId)) {
             throw new Error("对应的 Codex 历史会话不存在，无法恢复。");
         }
     }
     const newMode = parseExecutionMode(body.mode, parseExecutionMode(existingSession.mode, defaultMode));
-    const resumeCommand = provider === "codex"
-        ? buildCodexResumeCommand(command, resumeSessionId)
-        : `${command} --resume ${resumeSessionId}`;
+    const resumeCommand = buildProviderResumeCommand(provider, command, resumeSessionId);
     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;
     return processes.start(resumeCommand, existingSession.cwd, newMode, initialInput, {
@@ -300,7 +299,8 @@ function canAutoResumePtyForInput(snapshot, input) {
     return Boolean(snapshot
         && (snapshot.sessionKind ?? "pty") === "pty"
         && snapshot.status !== "running"
-        && (snapshot.provider === "claude" || snapshot.provider === "codex" || /^codex\b/.test(snapshot.command.trim()) || /^claude\b/.test(snapshot.command.trim()))
+        && (snapshot.provider === "claude" || snapshot.provider === "codex" || snapshot.provider === "opencode" || snapshot.provider === "grok" || snapshot.provider === "qoder"
+            || /^(?:claude|codex|opencode|grok|qodercli)\b/.test(snapshot.command.trim()))
         && snapshot.claudeSessionId
         && input);
 }