@co0ontty/wand 2.12.0 → 2.13.0

package/dist/server.js

@@ -37,6 +37,7 @@ import { renderApp } from "./web-ui/index.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
+import { checkProviderCliUpdates, updateProviderClis, verifyProviderCliUpdateResults, } from "./provider-cli-updater.js";
 const execAsync = promisify(exec);
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
 const RUNTIME_ROOT_DIR = path.resolve(SERVER_MODULE_DIR, "..");
@@ -1108,6 +1109,15 @@ export async function startServer(config, configPath) {
     const processes = new ProcessManager(config, storage, configDir);
     const structuredLogger = new SessionLogger(configDir, config.shortcutLogMaxBytes);
     const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger);
+    let providerCliUpdateCache = null;
+    let providerCliUpdateInFlight = false;
+    let updateInFlight = false;
+    const refreshProviderCliUpdates = async () => {
+        const items = await checkProviderCliUpdates({ inheritEnv: config.inheritEnv !== false });
+        const result = { items, checkedAt: new Date().toISOString() };
+        providerCliUpdateCache = result;
+        return result;
+    };
     const useHttps = config.https === true;
     const protocol = useHttps ? "https" : "http";
     const requireAuth = buildRequireAuth(useHttps, storage, config);
@@ -1359,6 +1369,7 @@ export async function startServer(config, configPath) {
             defaultCwd: config.defaultCwd,
             defaultModel: defaultModels.claude,
             defaultCodexModel: defaultModels.codex,
+            defaultOpenCodeModel: defaultModels.opencode,
             defaultModels,
             defaultThinkingEffort: config.defaultThinkingEffort ?? "off",
             commandPresets: config.commandPresets,
@@ -1366,6 +1377,7 @@ export async function startServer(config, configPath) {
             structuredRunners: [
                 { label: "Claude Structured", runner: "claude-cli-print" },
                 { label: "Codex Structured", runner: "codex-cli-exec" },
+                { label: "OpenCode Structured", runner: "opencode-cli-run" },
             ],
             structuredChatPersona,
             cardDefaults: config.cardDefaults,
@@ -1527,6 +1539,7 @@ export async function startServer(config, configPath) {
                 ...safeConfig,
                 defaultModel: defaultModels.claude,
                 defaultCodexModel: defaultModels.codex,
+                defaultOpenCodeModel: defaultModels.opencode,
                 defaultModels,
             },
             hasCert: existsSync(certPaths.keyPath) && existsSync(certPaths.certPath),
@@ -1543,6 +1556,7 @@ export async function startServer(config, configPath) {
                 web: storage.getConfigValue("autoUpdateWeb") === "true",
                 apk: storage.getConfigValue("autoUpdateApk") === "true",
                 dmg: storage.getConfigValue("autoUpdateDmg") === "true",
+                cli: storage.getConfigValue("autoUpdateProviderClis") === "true",
             },
             androidApk: {
                 enabled: config.android?.enabled === true,
@@ -1713,6 +1727,10 @@ export async function startServer(config, configPath) {
                     writePreferenceToStorage(config, storage, "defaultCodexModel", modelDefaults.codex);
                     touchedPreferenceField = true;
                 }
+                if (Object.prototype.hasOwnProperty.call(modelDefaults, "opencode")) {
+                    writePreferenceToStorage(config, storage, "defaultOpenCodeModel", modelDefaults.opencode);
+                    touchedPreferenceField = true;
+                }
             }
             catch (err) {
                 res.status(400).json({ error: getErrorMessage(err, "默认模型配置校验失败") });
@@ -1748,6 +1766,7 @@ export async function startServer(config, configPath) {
                     ...safeConfig,
                     defaultModel: defaultModels.claude,
                     defaultCodexModel: defaultModels.codex,
+                    defaultOpenCodeModel: defaultModels.opencode,
                     defaultModels,
                 },
                 restartRequired: touchedDeployField,
@@ -1763,10 +1782,13 @@ export async function startServer(config, configPath) {
         res.json({
             models: cached.models,
             codexModels: cached.codexModels,
+            opencodeModels: cached.opencodeModels,
             claudeVersion: cached.claudeVersion,
+            opencodeVersion: cached.opencodeVersion,
             refreshedAt: cached.refreshedAt,
             defaultModel: defaultModels.claude,
             defaultCodexModel: defaultModels.codex,
+            defaultOpenCodeModel: defaultModels.opencode,
             defaultModels,
         });
     });
@@ -1777,10 +1799,13 @@ export async function startServer(config, configPath) {
             res.json({
                 models: refreshed.models,
                 codexModels: refreshed.codexModels,
+                opencodeModels: refreshed.opencodeModels,
                 claudeVersion: refreshed.claudeVersion,
+                opencodeVersion: refreshed.opencodeVersion,
                 refreshedAt: refreshed.refreshedAt,
                 defaultModel: defaultModels.claude,
                 defaultCodexModel: defaultModels.codex,
+                defaultOpenCodeModel: defaultModels.opencode,
                 defaultModels,
             });
         }
@@ -1788,6 +1813,46 @@ export async function startServer(config, configPath) {
             res.status(500).json({ error: getErrorMessage(error, "刷新模型列表失败。") });
         }
     });
+    app.get("/api/provider-cli-updates", async (req, res) => {
+        try {
+            const force = req.query.refresh === "1" || !providerCliUpdateCache;
+            const data = force ? await refreshProviderCliUpdates() : providerCliUpdateCache;
+            res.json({
+                ...data,
+                updating: providerCliUpdateInFlight,
+                autoUpdate: storage.getConfigValue("autoUpdateProviderClis") === "true",
+            });
+        }
+        catch (error) {
+            res.status(500).json({ error: getErrorMessage(error, "检查 CLI 更新失败。") });
+        }
+    });
+    app.post("/api/provider-cli-updates", express.json(), async (req, res) => {
+        if (providerCliUpdateInFlight || updateInFlight) {
+            res.status(409).json({ error: "CLI 更新正在进行中，请稍候。" });
+            return;
+        }
+        const rawIds = Array.isArray(req.body?.ids) ? req.body.ids : [];
+        const ids = rawIds.filter((value) => value === "claude" || value === "codex" || value === "opencode");
+        providerCliUpdateInFlight = true;
+        try {
+            const before = await refreshProviderCliUpdates();
+            const commandResults = await updateProviderClis(before.items, ids.length ? ids : undefined, {
+                inheritEnv: config.inheritEnv !== false,
+                onLog: (line) => process.stdout.write(`[wand] ${line}\n`),
+            });
+            const after = await refreshProviderCliUpdates();
+            const results = verifyProviderCliUpdateResults(commandResults, after.items);
+            refreshModels().catch(() => { });
+            res.json({ ok: results.every((item) => item.ok), results, ...after, autoUpdate: storage.getConfigValue("autoUpdateProviderClis") === "true" });
+        }
+        catch (error) {
+            res.status(500).json({ error: getErrorMessage(error, "更新 CLI 失败。") });
+        }
+        finally {
+            providerCliUpdateInFlight = false;
+        }
+    });
     app.post("/api/settings/upload-cert", async (req, res) => {
         const { key, cert } = req.body;
         if (!key || !cert) {
@@ -1837,9 +1902,8 @@ export async function startServer(config, configPath) {
             res.status(500).json({ error: getErrorMessage(error, "检查更新失败。") });
         }
     });
-    let updateInFlight = false;
     app.post("/api/update", async (_req, res) => {
-        if (updateInFlight) {
+        if (updateInFlight || providerCliUpdateInFlight) {
             res.status(409).json({ error: "更新正在进行中，请稍候。" });
             return;
         }
@@ -2354,7 +2418,11 @@ export async function startServer(config, configPath) {
         try {
             const origin = parseSessionCreationOrigin(body);
             const rawModel = typeof body.model === "string" ? body.model.trim() : "";
-            const provider = body.provider === "codex" || /^codex\b/.test(body.command.trim()) ? "codex" : "claude";
+            const provider = body.provider === "codex" || /^codex\b/.test(body.command.trim())
+                ? "codex"
+                : body.provider === "opencode" || /^opencode\b/.test(body.command.trim())
+                    ? "opencode"
+                    : "claude";
             const effectiveModel = rawModel || getDefaultModelForProvider(config, provider) || undefined;
             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;
@@ -2545,10 +2613,11 @@ export async function startServer(config, configPath) {
         const web = storage.getConfigValue("autoUpdateWeb") === "true";
         const apk = storage.getConfigValue("autoUpdateApk") === "true";
         const dmg = storage.getConfigValue("autoUpdateDmg") === "true";
-        res.json({ web, apk, dmg });
+        const cli = storage.getConfigValue("autoUpdateProviderClis") === "true";
+        res.json({ web, apk, dmg, cli });
     });
     app.post("/api/auto-update", express.json(), (req, res) => {
-        const { web, apk, dmg } = req.body;
+        const { web, apk, dmg, cli } = req.body;
         if (typeof web === "boolean") {
             storage.setConfigValue("autoUpdateWeb", String(web));
         }
@@ -2558,10 +2627,14 @@ export async function startServer(config, configPath) {
         if (typeof dmg === "boolean") {
             storage.setConfigValue("autoUpdateDmg", String(dmg));
         }
+        if (typeof cli === "boolean") {
+            storage.setConfigValue("autoUpdateProviderClis", String(cli));
+        }
         res.json({
             web: storage.getConfigValue("autoUpdateWeb") === "true",
             apk: storage.getConfigValue("autoUpdateApk") === "true",
             dmg: storage.getConfigValue("autoUpdateDmg") === "true",
+            cli: storage.getConfigValue("autoUpdateProviderClis") === "true",
         });
     });
     // ── Update channel (stable / beta) ──
@@ -2660,7 +2733,35 @@ export async function startServer(config, configPath) {
             });
         }
     }
+    async function performProviderCliAutoUpdate() {
+        if (storage.getConfigValue("autoUpdateProviderClis") !== "true" || providerCliUpdateInFlight || updateInFlight)
+            return;
+        providerCliUpdateInFlight = true;
+        try {
+            const before = await refreshProviderCliUpdates();
+            const available = before.items.filter((item) => item.updateAvailable && item.updateSupported);
+            if (!available.length)
+                return;
+            const commandResults = await updateProviderClis(before.items, available.map((item) => item.id), {
+                inheritEnv: config.inheritEnv !== false,
+                onLog: (line) => process.stdout.write(`[wand] ${line}\n`),
+            });
+            const after = await refreshProviderCliUpdates();
+            const results = verifyProviderCliUpdateResults(commandResults, after.items);
+            for (const result of results) {
+                process.stdout.write(`[wand] CLI 自动更新 ${result.ok ? "完成" : "失败"}: ${result.message}\n`);
+            }
+            refreshModels().catch(() => { });
+        }
+        catch (error) {
+            process.stdout.write(`[wand] CLI 自动更新失败: ${getErrorMessage(error)}\n`);
+        }
+        finally {
+            providerCliUpdateInFlight = false;
+        }
+    }
     let updateCheckTimer = null;
+    let providerCliUpdateTimer = null;
     if (updateChecksEnabled) {
         // Background update check on startup
         performAutoUpdate().catch(() => { });
@@ -2669,6 +2770,15 @@ export async function startServer(config, configPath) {
             performAutoUpdate().catch(() => { });
         }, 30 * 60 * 1000);
         updateCheckTimer.unref();
+        // 与 Wand 自身 npm 更新错峰，避免两个全局 updater 同时改 PATH / bin 链接。
+        providerCliUpdateTimer = setTimeout(() => {
+            performProviderCliAutoUpdate().catch(() => { });
+            providerCliUpdateTimer = setInterval(() => {
+                performProviderCliAutoUpdate().catch(() => { });
+            }, 30 * 60 * 1000);
+            providerCliUpdateTimer.unref();
+        }, 2 * 60 * 1000);
+        providerCliUpdateTimer.unref();
     }
     const close = () => new Promise((resolve) => {
         let done = false;
@@ -2692,6 +2802,8 @@ export async function startServer(config, configPath) {
         catch { /* ignore */ }
         if (updateCheckTimer)
             clearInterval(updateCheckTimer);
+        if (providerCliUpdateTimer)
+            clearInterval(providerCliUpdateTimer);
         try {
             server.close(() => finish());
         }

package/dist/session-ai-context.d.ts

@@ -12,6 +12,6 @@ export interface SessionAiContext {
  */
 export declare function resolveSessionProvider(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command">): SessionProvider;
 /** Build the provider-specific settings used by session-adjacent AI actions. */
-export declare function resolveSessionAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultThinkingEffort" | "inheritEnv">): SessionAiContext;
+export declare function resolveSessionAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultOpenCodeModel" | "defaultThinkingEffort" | "inheritEnv">): SessionAiContext;
 /** Build the AI context for quick-commit actions from their global preferences. */
-export declare function resolveCommitAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultThinkingEffort" | "inheritEnv" | "commitCli" | "commitModel">): SessionAiContext;
+export declare function resolveCommitAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultOpenCodeModel" | "defaultThinkingEffort" | "inheritEnv" | "commitCli" | "commitModel">): SessionAiContext;

package/dist/session-ai-context.js

@@ -5,18 +5,22 @@ import { getDefaultModelForProvider } from "./config.js";
  * still identify Codex through structuredState, runner, or command.
  */
 export function resolveSessionProvider(snapshot) {
-    if (snapshot.provider === "claude" || snapshot.provider === "codex") {
+    if (snapshot.provider === "claude" || snapshot.provider === "codex" || snapshot.provider === "opencode") {
         return snapshot.provider;
     }
-    if (snapshot.structuredState?.provider === "claude" || snapshot.structuredState?.provider === "codex") {
+    if (snapshot.structuredState?.provider === "claude" || snapshot.structuredState?.provider === "codex" || snapshot.structuredState?.provider === "opencode") {
         return snapshot.structuredState.provider;
     }
     const runner = snapshot.runner ?? snapshot.structuredState?.runner;
     if (runner === "codex-cli-exec")
         return "codex";
+    if (runner === "opencode-cli-run")
+        return "opencode";
     if (runner === "claude-cli" || runner === "claude-cli-print" || runner === "claude-sdk")
         return "claude";
-    return /^codex\b/i.test(snapshot.command.trim()) ? "codex" : "claude";
+    if (/^codex\b/i.test(snapshot.command.trim()))
+        return "codex";
+    return /^opencode\b/i.test(snapshot.command.trim()) ? "opencode" : "claude";
 }
 function normalizeModel(value) {
     const model = value?.trim();
@@ -39,7 +43,7 @@ export function resolveCommitAiContext(snapshot, config) {
     const sessionContext = resolveSessionAiContext(snapshot, config);
     return {
         ...sessionContext,
-        provider: config.commitCli === "codex" ? "codex" : "claude",
+        provider: config.commitCli === "codex" || config.commitCli === "opencode" ? config.commitCli : "claude",
         model: normalizeModel(config.commitModel),
     };
 }

package/dist/storage.js

@@ -18,7 +18,7 @@ function parseQueuedMessages(raw) {
     return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : undefined;
 }
 function inferSessionProvider(row) {
-    if (row.provider === "claude" || row.provider === "codex") {
+    if (row.provider === "claude" || row.provider === "codex" || row.provider === "opencode") {
         return row.provider;
     }
     if (row.runner === "claude-cli" || row.runner === "claude-cli-print") {
@@ -27,8 +27,13 @@ function inferSessionProvider(row) {
     if (row.runner === "codex-cli-exec") {
         return "codex";
     }
+    if (row.runner === "opencode-cli-run") {
+        return "opencode";
+    }
     if (/^codex\b/i.test(row.command.trim()))
         return "codex";
+    if (/^opencode\b/i.test(row.command.trim()))
+        return "opencode";
     return /^claude\b/i.test(row.command.trim()) ? "claude" : undefined;
 }
 function parseWorktreeInfo(raw) {

package/dist/structured-session-manager.d.ts

@@ -35,6 +35,8 @@ export declare function thinkingEffortToClaudeCliEffort(effort: SessionSnapshot[
 export declare function thinkingEffortToClaudeSlashEffort(effort: SessionSnapshot["thinkingEffort"]): string;
 /** Codex CLI 用：把 thinkingEffort 映射到 model_reasoning_effort 配置。off → 不覆盖 Codex 默认。 */
 export declare function thinkingEffortToCodexReasoningEffort(effort: SessionSnapshot["thinkingEffort"]): string | null;
+/** OpenCode exposes provider-specific reasoning presets through `--variant`. */
+export declare function thinkingEffortToOpenCodeVariant(effort: SessionSnapshot["thinkingEffort"]): string | null;
 /**
  * Preserve both Responses content-part arrays and arbitrary structured tool output.
  * Arrays without a `type` discriminator (for example Codex tool_search results)
@@ -179,6 +181,10 @@ export declare class StructuredSessionManager {
     private incrementApprovalStats;
     private buildCodexArgs;
     private runCodexStreaming;
+    private buildOpenCodeArgs;
+    private openCodeToolName;
+    private applyOpenCodeEvent;
+    private runOpenCodeStreaming;
     /**
      * Spawn `claude -p --output-format stream-json` and parse NDJSON lines as
      * they arrive, emitting incremental WebSocket events so the UI can render