@co0ontty/wand 2.12.0 → 2.13.0

package/dist/provider-cli-updater.js

@@ -0,0 +1,225 @@
+import { execFile } from "node:child_process";
+import { realpathSync } from "node:fs";
+import process from "node:process";
+import { promisify } from "node:util";
+import { buildChildEnv } from "./env-utils.js";
+import { getErrorMessage } from "./error-utils.js";
+import { whichSync } from "./path-repair.js";
+import { compareSemver, extractSemver } from "./version-utils.js";
+const execFileAsync = promisify(execFile);
+const VERSION_TIMEOUT_MS = 8_000;
+const REGISTRY_TIMEOUT_MS = 15_000;
+const UPDATE_TIMEOUT_MS = 5 * 60_000;
+const MAX_BUFFER = 4 * 1024 * 1024;
+const PROVIDER_CLI_SPECS = [
+    {
+        id: "claude",
+        label: "Claude Code",
+        command: "claude",
+        npmPackage: "@anthropic-ai/claude-code",
+        versionArgs: ["--version"],
+        updateArgs: ["update"],
+    },
+    {
+        id: "codex",
+        label: "Codex",
+        command: "codex",
+        npmPackage: "@openai/codex",
+        versionArgs: ["--version"],
+        updateArgs: ["update"],
+    },
+    {
+        id: "opencode",
+        label: "OpenCode",
+        command: "opencode",
+        npmPackage: "opencode-ai",
+        versionArgs: ["--version"],
+        updateArgs: ["upgrade"],
+    },
+];
+function childEnv(options) {
+    return options.env ?? buildChildEnv(options.inheritEnv !== false);
+}
+async function runCommand(command, args, timeout, options) {
+    const { stdout, stderr } = await execFileAsync(command, args, {
+        timeout,
+        env: childEnv(options),
+        maxBuffer: MAX_BUFFER,
+    });
+    return { stdout: String(stdout ?? ""), stderr: String(stderr ?? "") };
+}
+export function parseProviderCliVersion(output) {
+    return extractSemver(output);
+}
+function resolveInstallKind(executable, id, version) {
+    if (!executable)
+        return "unknown";
+    let resolved = executable;
+    try {
+        resolved = realpathSync(executable);
+    }
+    catch { /* keep original */ }
+    const normalized = resolved.replace(/\\/g, "/").toLowerCase();
+    if (id === "opencode" && version && /^0\.0\./.test(version))
+        return "legacy";
+    if (normalized.includes("/node_modules/") || normalized.includes("/npm/"))
+        return "npm";
+    if (normalized.includes("/cellar/") || normalized.includes("/caskroom/") || normalized.includes("/homebrew/"))
+        return "brew";
+    if (normalized.includes("/.claude/") || normalized.includes("/.codex/") || normalized.includes("/.opencode/"))
+        return "native";
+    return "unknown";
+}
+function isUpdateSupported(id, version) {
+    return !(id === "opencode" && version !== null && /^0\.0\./.test(version));
+}
+export function providerCliUpdateAvailable(currentVersion, latestVersion) {
+    if (!currentVersion || !latestVersion)
+        return false;
+    return compareSemver(latestVersion, currentVersion) > 0;
+}
+async function readInstalledVersion(spec, options) {
+    const env = childEnv(options);
+    const executable = whichSync(spec.command, { env, timeoutMs: options.versionTimeoutMs ?? VERSION_TIMEOUT_MS });
+    if (!executable)
+        return { executable: null, version: null };
+    try {
+        const result = await runCommand(executable, spec.versionArgs, options.versionTimeoutMs ?? VERSION_TIMEOUT_MS, options);
+        const version = parseProviderCliVersion(`${result.stdout}\n${result.stderr}`);
+        return version
+            ? { executable, version }
+            : { executable, version: null, error: "无法解析已安装版本。" };
+    }
+    catch (error) {
+        return { executable, version: null, error: getErrorMessage(error, "读取版本失败。") };
+    }
+}
+async function readLatestVersion(spec, options) {
+    const npm = options.env?.WAND_NPM_BIN || process.env.WAND_NPM_BIN || (process.platform === "win32" ? "npm.cmd" : "npm");
+    try {
+        const result = await runCommand(npm, ["view", `${spec.npmPackage}@latest`, "version"], options.registryTimeoutMs ?? REGISTRY_TIMEOUT_MS, options);
+        const version = parseProviderCliVersion(result.stdout);
+        return version ? { version } : { version: null, error: "npm registry 未返回版本。" };
+    }
+    catch (error) {
+        return { version: null, error: getErrorMessage(error, "无法连接 npm registry。") };
+    }
+}
+export async function checkProviderCliUpdates(options = {}) {
+    return Promise.all(PROVIDER_CLI_SPECS.map(async (spec) => {
+        const [installed, latest] = await Promise.all([
+            readInstalledVersion(spec, options),
+            readLatestVersion(spec, options),
+        ]);
+        const updateSupported = isUpdateSupported(spec.id, installed.version);
+        const errors = [installed.error, latest.error].filter(Boolean);
+        if (!updateSupported) {
+            errors.push("检测到已归档的 OpenCode 0.0.x；请先卸载旧包并安装 opencode-ai@latest。");
+        }
+        return {
+            id: spec.id,
+            label: spec.label,
+            command: spec.command,
+            executable: installed.executable,
+            installed: installed.executable !== null,
+            currentVersion: installed.version,
+            latestVersion: latest.version,
+            updateAvailable: providerCliUpdateAvailable(installed.version, latest.version),
+            updateSupported,
+            installKind: resolveInstallKind(installed.executable, spec.id, installed.version),
+            ...(errors.length ? { error: errors.join("；") } : {}),
+        };
+    }));
+}
+function trimOutput(value) {
+    const trimmed = value.trim();
+    return trimmed.length > 4_096 ? `...${trimmed.slice(-4_096)}` : trimmed;
+}
+export async function updateProviderClis(statuses, ids, options = {}) {
+    const selected = new Set(ids?.length ? ids : statuses.filter((item) => item.updateAvailable).map((item) => item.id));
+    const results = [];
+    for (const spec of PROVIDER_CLI_SPECS) {
+        if (!selected.has(spec.id))
+            continue;
+        const status = statuses.find((item) => item.id === spec.id);
+        if (!status?.installed) {
+            results.push({
+                id: spec.id,
+                label: spec.label,
+                ok: false,
+                skipped: true,
+                fromVersion: status?.currentVersion ?? null,
+                toVersion: status?.latestVersion ?? null,
+                message: `${spec.label} 未安装。`,
+            });
+            continue;
+        }
+        if (!status.updateAvailable) {
+            results.push({
+                id: spec.id,
+                label: spec.label,
+                ok: true,
+                skipped: true,
+                fromVersion: status.currentVersion,
+                toVersion: status.latestVersion,
+                message: `${spec.label} 已是最新版。`,
+            });
+            continue;
+        }
+        if (!status.updateSupported) {
+            results.push({
+                id: spec.id,
+                label: spec.label,
+                ok: false,
+                skipped: true,
+                fromVersion: status.currentVersion,
+                toVersion: status.latestVersion,
+                message: status.error ?? `${spec.label} 当前安装方式不支持自动更新。`,
+            });
+            continue;
+        }
+        const executable = status.executable;
+        options.onLog?.(`[CLI Update] ${spec.label}: ${status.currentVersion} -> ${status.latestVersion}`);
+        try {
+            const output = await runCommand(executable, spec.updateArgs, options.updateTimeoutMs ?? UPDATE_TIMEOUT_MS, options);
+            const combined = trimOutput([output.stdout, output.stderr].filter(Boolean).join("\n"));
+            results.push({
+                id: spec.id,
+                label: spec.label,
+                ok: true,
+                skipped: false,
+                fromVersion: status.currentVersion,
+                toVersion: status.latestVersion,
+                message: `${spec.label} 更新命令执行完成。`,
+                ...(combined ? { output: combined } : {}),
+            });
+        }
+        catch (error) {
+            results.push({
+                id: spec.id,
+                label: spec.label,
+                ok: false,
+                skipped: false,
+                fromVersion: status.currentVersion,
+                toVersion: status.latestVersion,
+                message: getErrorMessage(error, `${spec.label} 更新失败。`),
+            });
+        }
+    }
+    return results;
+}
+/** Re-check the active PATH after updating so duplicate installs cannot masquerade as success. */
+export function verifyProviderCliUpdateResults(results, statuses) {
+    return results.map((result) => {
+        if (!result.ok || result.skipped)
+            return result;
+        const active = statuses.find((item) => item.id === result.id);
+        if (!active || !active.updateAvailable)
+            return result;
+        return {
+            ...result,
+            ok: false,
+            message: `${result.label} updater 已执行，但当前 PATH 仍指向 ${active.currentVersion ?? "旧版本"}；请检查是否存在多份安装。`,
+        };
+    });
+}

package/dist/pty-text-utils.js

@@ -26,100 +26,62 @@ export function stripAnsi(text) {
         .replace(/[\t ]+\n/g, "\n")
         .replace(/\n{3,}/g, "\n\n");
 }
+const NOISE_LINE_FRAGMENTS = [
+    "esc to interrupt",
+    "Claude Code v",
+    "Failed to install Anthropic",
+    "Claude Code has switched",
+    "? for shortcuts",
+    "Claude is waiting",
+    "[wand]",
+    "ctrl+g",
+    "/effort",
+    "auto mode is unavailable",
+    "Germinating",
+    "Doodling",
+    "Brewing",
+    "Captured Claude session ID",
+];
+const NOISE_LINE_PATTERNS = [
+    /^────/,
+    /^[❯›]$/,
+    /^[╭╰│┌└┐┘├┤┬┴┼─═]{2,}$/,
+    /^[▁▂▃▄▅▆▇█▔▕▏▐]+$/,
+    /^Sonnet\b/,
+    /^(?:0;|9;)/,
+    /^Using .* for .* session/,
+    /MCP server.*failed/i,
+    /^●.*·/,
+    /^\[[<>]/,
+    /^>_\s*OpenAI Codex\b/,
+    /^OpenAI Codex\b/i,
+    /^(model|directory):\s+/i,
+    /^(tip|context):\s+/i,
+    /^work(tree|space):\s+/i,
+    /^(approvals?|sandbox|provider|session id):\s+/i,
+    /^(thinking|working)(\.\.\.|…)?$/i,
+    /^[•◦·]\s+Working\b/i,
+    /^[•◦·]\s+(Running|Planning|Applying|Reading|Searching)\b/i,
+    /^[•◦·]\s+(Inspecting|Reviewing|Summarizing|Editing|Updating|Writing)\b/i,
+    /^[•◦·]\s+Completed\b/i,
+    /^(ctrl|enter|tab|shift|esc|alt)\+/i,
+    /\b(open|close|toggle) (chat|terminal)\b/i,
+    /\b(approve|deny)\b.*\b(permission|approval)\b/i,
+    /^(use|press) .* (to|for) .*/i,
+    /^(?:token|context window|remaining context|conversation):\s+/i,
+    /^(?:cwd|path):\s+\//i,
+];
 /** Lines considered as UI noise that should be excluded from chat view. */
 export function isNoiseLine(line) {
-    if (!line)
-        return false;
     const trimmed = line.trim();
     if (!trimmed)
         return false;
-    if (trimmed.startsWith("────"))
-        return true;
-    if (trimmed === "❯" || trimmed === "›")
-        return true;
-    if (/^[╭╰│┌└┐┘├┤┬┴┼─═]{2,}$/.test(trimmed))
-        return true;
-    if (/^[▁▂▃▄▅▆▇█▔▕▏▐]+$/.test(trimmed))
-        return true;
-    if (trimmed.includes("esc to interrupt"))
-        return true;
-    if (trimmed.includes("Claude Code v"))
-        return true;
-    if (/^Sonnet\b/.test(trimmed))
-        return true;
-    if (trimmed.includes("Failed to install Anthropic"))
-        return true;
-    if (trimmed.includes("Claude Code has switched"))
-        return true;
-    if (trimmed.includes("? for shortcuts"))
-        return true;
-    if (trimmed.includes("Claude is waiting"))
-        return true;
-    if (trimmed.includes("[wand]"))
-        return true;
-    if (trimmed.startsWith("0;") || trimmed.startsWith("9;"))
-        return true;
-    if (trimmed.includes("ctrl+g"))
-        return true;
-    if (trimmed.includes("/effort"))
-        return true;
-    if (/^Using .* for .* session/.test(trimmed))
-        return true;
-    if (trimmed.startsWith("Press ") && trimmed.includes(" for"))
-        return true;
-    if (trimmed.startsWith("type ") && trimmed.includes(" to "))
-        return true;
-    if (trimmed.includes("auto mode is unavailable"))
-        return true;
-    if (/MCP server.*failed/i.test(trimmed))
-        return true;
-    if (trimmed.includes("Germinating") || trimmed.includes("Doodling") || trimmed.includes("Brewing"))
-        return true;
-    if (trimmed.includes("Permissions") && trimmed.includes("mode"))
-        return true;
-    if (trimmed.startsWith("●") && trimmed.includes("·"))
-        return true;
-    if (trimmed.startsWith("[>") || trimmed.startsWith("[<"))
-        return true;
-    if (trimmed.includes("Captured Claude session ID"))
-        return true;
-    if (/^>_\s*OpenAI Codex\b/.test(trimmed))
-        return true;
-    if (/^OpenAI Codex\b/i.test(trimmed))
-        return true;
-    if (/^(model|directory):\s+/i.test(trimmed))
-        return true;
-    if (/^(tip|context):\s+/i.test(trimmed))
-        return true;
-    if (/^work(tree|space):\s+/i.test(trimmed))
-        return true;
-    if (/^(approvals?|sandbox|provider|session id):\s+/i.test(trimmed))
-        return true;
-    if (/^(thinking|working)(\.\.\.|…)?$/i.test(trimmed))
-        return true;
-    if (/^[•◦·]\s+Working\b/i.test(trimmed))
-        return true;
-    if (/^[•◦·]\s+(Running|Planning|Applying|Reading|Searching)\b/i.test(trimmed))
-        return true;
-    if (/^[•◦·]\s+(Inspecting|Reviewing|Summarizing|Editing|Updating|Writing)\b/i.test(trimmed))
-        return true;
-    if (/^[•◦·]\s+Completed\b/i.test(trimmed))
-        return true;
-    if (/^(ctrl|enter|tab|shift|esc|alt)\+/i.test(trimmed))
-        return true;
-    if (/\b(open|close|toggle) (chat|terminal)\b/i.test(trimmed))
-        return true;
-    if (/\b(approve|deny)\b.*\b(permission|approval)\b/i.test(trimmed))
-        return true;
-    if (/^(use|press) .* (to|for) .*/i.test(trimmed))
-        return true;
-    if (/^(?:token|context window|remaining context|conversation):\s+/i.test(trimmed))
-        return true;
-    if (/^(?:cwd|path):\s+\//i.test(trimmed))
-        return true;
-    if (/^[<>│┆╎].*[<>│┆╎]$/.test(trimmed) && trimmed.length < 8)
-        return true;
-    return false;
+    return NOISE_LINE_FRAGMENTS.some((fragment) => trimmed.includes(fragment))
+        || NOISE_LINE_PATTERNS.some((pattern) => pattern.test(trimmed))
+        || (trimmed.startsWith("Press ") && trimmed.includes(" for"))
+        || (trimmed.startsWith("type ") && trimmed.includes(" to "))
+        || (trimmed.includes("Permissions") && trimmed.includes("mode"))
+        || (/^[<>│┆╎].*[<>│┆╎]$/.test(trimmed) && trimmed.length < 8);
 }
 /**
  * Append text to a windowed buffer, trimming from start if over max size.
@@ -153,10 +115,9 @@ function safeSliceTail(text, maxSize) {
     //    in well-formed terminal output) and keep lines aligned for replay.
     const LOOKAHEAD = 4096;
     const upper = Math.min(start + LOOKAHEAD, text.length);
-    for (let i = start; i < upper; i++) {
-        if (text.charCodeAt(i) === 0x0a)
-            return text.slice(i + 1);
-    }
+    const newlineAt = text.indexOf("\n", start);
+    if (newlineAt !== -1 && newlineAt < upper)
+        return text.slice(newlineAt + 1);
     // 3. No nearby newline. Detect whether `start` lands inside an open ANSI
     //    escape sequence by scanning backward for an ESC (0x1b). If we find one
     //    that is not yet terminated, advance past the sequence's final byte.
@@ -179,44 +140,31 @@ function safeSliceTail(text, maxSize) {
         // ST (`ESC \\` = 0x1b 0x5c) 终止。其它范围内字节（包括裸 `\`）
         // 都属于 payload，不能当终止符。CSI 等序列才用 0x40-0x7e final byte。
         const isOsc = escAt + 1 < text.length && text.charCodeAt(escAt + 1) === 0x5d;
-        let terminated = false;
-        for (let i = escAt + 1; i < start; i++) {
-            const code = text.charCodeAt(i);
-            if (code === 0x07) {
-                terminated = true;
-                break;
-            }
-            if (isOsc) {
-                if (code === 0x1b && i + 1 < start && text.charCodeAt(i + 1) === 0x5c) {
-                    terminated = true;
-                    break;
-                }
-                continue;
-            }
-            if (code >= 0x40 && code <= 0x7e) {
-                terminated = true;
-                break;
-            }
-        }
-        if (!terminated) {
+        if (findAnsiEnd(text, escAt + 1, start, isOsc) === -1) {
             const ansiUpper = Math.min(start + 256, text.length);
-            for (let i = start; i < ansiUpper; i++) {
-                const code = text.charCodeAt(i);
-                if (code === 0x07)
-                    return text.slice(i + 1);
-                if (isOsc) {
-                    if (code === 0x1b && i + 1 < ansiUpper && text.charCodeAt(i + 1) === 0x5c) {
-                        return text.slice(i + 2);
-                    }
-                    continue;
-                }
-                if (code >= 0x40 && code <= 0x7e)
-                    return text.slice(i + 1);
-            }
+            const ansiEnd = findAnsiEnd(text, start, ansiUpper, isOsc);
+            if (ansiEnd !== -1)
+                return text.slice(ansiEnd);
         }
     }
     return text.slice(start);
 }
+/** Return the index after an ANSI terminator, or -1 if none exists in the range. */
+function findAnsiEnd(text, start, upper, isOsc) {
+    for (let i = start; i < upper; i++) {
+        const code = text.charCodeAt(i);
+        if (code === 0x07)
+            return i + 1;
+        if (isOsc) {
+            if (code === 0x1b && i + 1 < upper && text.charCodeAt(i + 1) === 0x5c)
+                return i + 2;
+        }
+        else if (code >= 0x40 && code <= 0x7e) {
+            return i + 1;
+        }
+    }
+    return -1;
+}
 function isLikelyAnsiBody(text, idx) {
     // CSI parameter/intermediate range covers most common ANSI bodies.
     const code = text.charCodeAt(idx);
@@ -236,9 +184,7 @@ export function stripForEchoMatch(input) {
             i = skipAnsiSequence(input, i) - 1;
             continue;
         }
-        if (code < 0x20 || code === 0x7f)
-            continue;
-        if (code === 0x20)
+        if (code <= 0x20 || code === 0x7f)
             continue;
         out += input[i];
     }
@@ -335,8 +281,7 @@ export const FALLBACK_SCORE_THRESHOLD = 8;
  */
 export function scorePermissionLikelihood(normalized) {
     // Take the last ~5 lines
-    const lines = normalized.split("\n");
-    const tail = lines.slice(-8).join("\n");
+    const tail = normalized.split("\n").slice(-8).join("\n");
     // Slash-command menus are never permission prompts — zero the score so
     // fallback auto-approve and idle-probe both skip them.
     if (isSlashCommandMenu(tail)) {

package/dist/server-session-routes.js

@@ -247,18 +247,18 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/structured-sessions", express.json(), async (req, res) => {
         const body = req.body;
         try {
-            if (body.provider && body.provider !== "claude" && body.provider !== "codex") {
-                res.status(400).json({ error: "结构化会话当前仅支持 Claude 或 Codex provider。" });
+            if (body.provider && body.provider !== "claude" && body.provider !== "codex" && body.provider !== "opencode") {
+                res.status(400).json({ error: "结构化会话当前仅支持 Claude、Codex 或 OpenCode provider。" });
                 return;
             }
-            const provider = body.provider === "codex" ? "codex" : "claude";
+            const provider = body.provider === "codex" || body.provider === "opencode" ? body.provider : "claude";
             const rawModel = typeof body.model === "string" ? body.model.trim() : "";
             const origin = parseSessionCreationOrigin(body);
             const snapshot = structured.createSession({
                 cwd: resolveSessionCwd(body.cwd, config.defaultCwd),
                 mode: normalizeMode(body.mode, defaultMode),
                 provider,
-                runner: body.runner ?? (provider === "codex" ? "codex-cli-exec" : "claude-cli-print"),
+                runner: body.runner ?? (provider === "codex" ? "codex-cli-exec" : provider === "opencode" ? "opencode-cli-run" : "claude-cli-print"),
                 worktreeEnabled: body.worktreeEnabled === true,
                 model: rawModel || getDefaultModelForProvider(config, provider) || undefined,
                 thinkingEffort: typeof body.thinkingEffort === "string"