@co0ontty/wand 1.41.3 → 1.42.0

package/dist/update-helper.js

@@ -0,0 +1,238 @@
+import { spawn, spawnSync } from "node:child_process";
+import { chmodSync, existsSync, mkdtempSync, writeFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import { detectInstalledScope } from "./tui/commands.js";
+function shellQuote(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function shellArray(values) {
+    return values.map((value) => shellQuote(value)).join(" ");
+}
+function boolShell(value) {
+    return value ? "1" : "0";
+}
+function resolveBashPath() {
+    return existsSync("/bin/bash") ? "/bin/bash" : "bash";
+}
+function detectServiceScope() {
+    try {
+        return detectInstalledScope();
+    }
+    catch {
+        return null;
+    }
+}
+function buildHelperScript(opts, logPath, serviceScope) {
+    const isSystemdManaged = !!process.env.INVOCATION_ID;
+    const isLaunchdManaged = !!process.env.LAUNCHD_SOCKET || !!process.env.XPC_SERVICE_NAME;
+    const shouldStartService = serviceScope !== null;
+    const shouldRestartStandalone = !shouldStartService;
+    const npmCache = opts.env.npm_config_cache || path.join(os.homedir(), ".npm");
+    const timeoutSec = Math.max(30, Math.ceil((opts.timeoutMs ?? 300_000) / 1000));
+    const cliArgArray = opts.cliArgs;
+    return `#!/usr/bin/env bash
+set -u
+LOG=${shellQuote(logPath)}
+exec >>"$LOG" 2>&1
+echo "[wand-update] started at $(date -Is)"
+echo "[wand-update] parent pid: ${opts.parentPid}"
+echo "[wand-update] install spec: ${opts.installSpec}"
+
+export PATH=${shellQuote(opts.env.PATH || process.env.PATH || "")}
+export HOME=${shellQuote(opts.env.HOME || os.homedir())}
+export npm_config_cache=${shellQuote(npmCache)}
+CONFIG_PATH=${shellQuote(opts.configPath)}
+INSTALL_SPEC=${shellQuote(opts.installSpec)}
+PARENT_PID=${opts.parentPid}
+SERVICE_SCOPE=${shellQuote(serviceScope ?? "")}
+SHOULD_START_SERVICE=${boolShell(shouldStartService)}
+SHOULD_RESTART_STANDALONE=${boolShell(shouldRestartStandalone)}
+TIMEOUT_SEC=${timeoutSec}
+CLI_ARGS=(${shellArray(cliArgArray)})
+
+run() {
+  echo "+ $*"
+  "$@"
+}
+
+run_best_effort() {
+  echo "+ $*"
+  "$@" || true
+}
+
+wait_for_parent_exit() {
+  local pid="$1"
+  local i=0
+  while kill -0 "$pid" 2>/dev/null; do
+    i=$((i + 1))
+    if [ "$i" -ge 120 ]; then
+      echo "[wand-update] parent still alive after 60s; continuing"
+      return 0
+    fi
+    sleep 0.5
+  done
+}
+
+clean_leftovers() {
+  local npm_root
+  npm_root="$(npm root -g 2>/dev/null || true)"
+  if [ -n "$npm_root" ] && [ -d "$npm_root/@co0ontty" ]; then
+    find "$npm_root/@co0ontty" -maxdepth 1 -name ".wand-*" -type d -print -exec rm -rf {} + 2>/dev/null || true
+  fi
+}
+
+npm_install_wand() {
+  if command -v timeout >/dev/null 2>&1; then
+    run timeout "$TIMEOUT_SEC" npm install -g "$INSTALL_SPEC"
+  else
+    run npm install -g "$INSTALL_SPEC"
+  fi
+}
+
+npm_install_wand_force() {
+  if command -v timeout >/dev/null 2>&1; then
+    run timeout "$TIMEOUT_SEC" npm install -g --force "$INSTALL_SPEC"
+  else
+    run npm install -g --force "$INSTALL_SPEC"
+  fi
+}
+
+restart_or_start_service() {
+  if [ "$SHOULD_START_SERVICE" = "1" ]; then
+    if [ "$SERVICE_SCOPE" = "user" ]; then
+      run_best_effort wand service:install --user -c "$CONFIG_PATH"
+      run_best_effort systemctl --user restart wand.service
+    else
+      run_best_effort wand service:install -c "$CONFIG_PATH"
+      run_best_effort systemctl restart wand.service
+    fi
+    return
+  fi
+
+  if [ "$SHOULD_RESTART_STANDALONE" = "1" ]; then
+    echo "[wand-update] starting standalone process"
+    cd ${shellQuote(opts.cwd)}
+    local global_cli
+    global_cli="$(npm root -g 2>/dev/null)/@co0ontty/wand/dist/cli.js"
+    if [ -f "$global_cli" ]; then
+      nohup ${shellQuote(process.execPath)} "$global_cli" "$\{CLI_ARGS[@]}" >>"$LOG" 2>&1 &
+    else
+      nohup wand "$\{CLI_ARGS[@]}" >>"$LOG" 2>&1 &
+    fi
+  fi
+}
+
+main() {
+  if [ "$SERVICE_SCOPE" = "user" ]; then
+    run_best_effort systemctl --user stop wand.service
+  elif [ "$SERVICE_SCOPE" = "system" ]; then
+    run_best_effort systemctl stop wand.service
+  fi
+
+  wait_for_parent_exit "$PARENT_PID"
+  clean_leftovers
+
+  echo "[wand-update] installing"
+  if ! npm_install_wand; then
+    echo "[wand-update] first install failed; retrying with uninstall + force install"
+    clean_leftovers
+    run_best_effort npm uninstall -g @co0ontty/wand
+    clean_leftovers
+    npm_install_wand_force
+  fi
+
+  run wand init -c "$CONFIG_PATH"
+  restart_or_start_service
+  echo "[wand-update] completed at $(date -Is)"
+}
+
+main
+`;
+}
+function spawnDetached(scriptPath, _logPath, env, serviceScope) {
+    const baseEnv = { ...env };
+    const trySpawn = (cmd, args, method) => {
+        try {
+            const child = spawn(cmd, args, {
+                detached: true,
+                stdio: "ignore",
+                env: baseEnv,
+            });
+            child.unref();
+            return { pid: child.pid, method };
+        }
+        catch {
+            return null;
+        }
+    };
+    if (process.platform === "linux") {
+        const unitName = `wand-update-${process.pid}-${Date.now()}`;
+        const bashPath = resolveBashPath();
+        const runTransient = (args, method) => {
+            const res = spawnSync("systemd-run", args, {
+                encoding: "utf8",
+                timeout: 5000,
+                env: baseEnv,
+                stdio: "ignore",
+            });
+            return res.status === 0 ? { method } : null;
+        };
+        const userService = runTransient(["--user", `--unit=${unitName}`, "--quiet", "--collect", bashPath, scriptPath], "systemd-run --user") ??
+            runTransient(["--user", `--unit=${unitName}`, "--quiet", bashPath, scriptPath], "systemd-run --user");
+        if (userService)
+            return userService;
+        const systemService = runTransient([`--unit=${unitName}`, "--quiet", "--collect", bashPath, scriptPath], "systemd-run") ??
+            runTransient([`--unit=${unitName}`, "--quiet", bashPath, scriptPath], "systemd-run");
+        if (systemService)
+            return systemService;
+        if (serviceScope) {
+            return null;
+        }
+        const setsid = spawnSync("setsid", ["--version"], { encoding: "utf8", timeout: 2000 });
+        if (setsid.status === 0) {
+            const result = trySpawn("setsid", [bashPath, scriptPath], "setsid");
+            if (result)
+                return result;
+        }
+    }
+    if (process.platform === "darwin") {
+        const result = trySpawn("nohup", [resolveBashPath(), scriptPath], "nohup");
+        if (result)
+            return result;
+    }
+    return trySpawn(resolveBashPath(), [scriptPath], "bash detached");
+}
+export function startDetachedUpdateHelper(opts) {
+    const dir = mkdtempSync(path.join(os.tmpdir(), "wand-update-"));
+    const scriptPath = path.join(dir, "update.sh");
+    const logPath = path.join(dir, "update.log");
+    const serviceScope = detectServiceScope();
+    writeFileSync(scriptPath, buildHelperScript(opts, logPath, serviceScope), { encoding: "utf8", mode: 0o700 });
+    chmodSync(scriptPath, 0o700);
+    const spawned = spawnDetached(scriptPath, logPath, opts.env, serviceScope);
+    if (!spawned) {
+        return {
+            started: false,
+            scriptPath,
+            logPath,
+            message: "无法启动独立更新 helper。",
+        };
+    }
+    return {
+        started: true,
+        scriptPath,
+        logPath,
+        pid: spawned.pid,
+        message: `独立更新 helper 已启动 (${spawned.method})。日志: ${logPath}`,
+    };
+}
+export function canUseDetachedUpdateHelper() {
+    if (process.platform === "win32")
+        return false;
+    if (existsSync("/bin/bash"))
+        return true;
+    const res = spawnSync("bash", ["--version"], { encoding: "utf8", timeout: 2000 });
+    return res.status === 0;
+}

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

@@ -8888,7 +8888,7 @@
       // 标签直接用 Claude CLI 原生 magic word：think / think hard / ultrathink。
       // 这样用户一眼能对上官方文档里的思考强度档位，PTY 模式下也是这几个词被注入到 prompt 前缀。
       var THINKING_LEVELS = [
-        { id: "off",      label: "off",        hint: "不启用思考（CLI 无前缀；SDK 关闭 thinking；Codex --reasoning-effort minimal）" },
+        { id: "off",      label: "off",        hint: "不启用思考（CLI 无前缀；SDK 关闭 thinking；Codex minimal）" },
         { id: "standard", label: "think",      hint: "Claude CLI: think · SDK budget 4096 · Codex low" },
         { id: "deep",     label: "think hard", hint: "Claude CLI: think hard · SDK budget 16000 · Codex medium" },
         { id: "max",      label: "ultrathink", hint: "Claude CLI: ultrathink · SDK budget 31999 · Codex high" }
@@ -11322,7 +11322,9 @@
             msgEl.classList.remove("hidden");
           }
           updateBtn.classList.add("hidden");
-          if (data.restartRequired !== false) {
+          if (data.detachedUpdate) {
+            showRestartOverlay();
+          } else if (data.restartRequired !== false) {
             performRestart(null, msgEl);
           } else {
             // \u670d\u52a1\u7aef\u660e\u786e\u8868\u793a\u4e0d\u9700\u8981\u91cd\u542f\uff0c\u4fdd\u7559\u624b\u52a8\u91cd\u542f\u6309\u94ae
@@ -22089,6 +22091,10 @@
             setSubtitle((data.message || "\u66f4\u65b0\u5b8c\u6210") + "\uff0c\u6b63\u5728\u91cd\u542f\u670d\u52a1\u2026");
             setStatus("");
             if (actionLabel) actionLabel.textContent = "\u6b63\u5728\u91cd\u542f\u2026";
+            if (data.detachedUpdate) {
+              showRestartOverlay();
+              return;
+            }
             if (data.restartRequired === false) {
               setProgress(false);
               card.classList.remove("is-busy");
@@ -22174,7 +22180,7 @@
         document.body.appendChild(overlay);
 
         var attempts = 0;
-        var maxAttempts = 20; // 20 * 2s = 40s
+        var maxAttempts = 180; // 180 * 2s = 6min; beta git installs can be slow
         var timer = setInterval(function() {
           attempts++;
           fetch("/api/config", { credentials: "same-origin" })

package/dist/web-ui/embedded-assets.d.ts

@@ -0,0 +1,23 @@
+export declare const EMBEDDED_WEB_ASSET_VERSION = "ed9dad22c425";
+export declare const EMBEDDED_WEB_ASSETS: {
+    readonly scriptsJs: string;
+    readonly stylesCss: string;
+    readonly vendor: {
+        readonly "/vendor/wterm/wterm.bundle.js": {
+            readonly content: string;
+            readonly contentType: "application/javascript";
+            readonly hash: "5c8595b1";
+        };
+        readonly "/vendor/wterm/terminal.css": {
+            readonly content: string;
+            readonly contentType: "text/css; charset=utf-8";
+            readonly hash: "e6459118";
+        };
+        readonly "/vendor/qrcode/qrcode.bundle.js": {
+            readonly content: string;
+            readonly contentType: "application/javascript";
+            readonly hash: "8be76aad";
+        };
+    };
+};
+export type EmbeddedVendorAssetPath = keyof typeof EMBEDDED_WEB_ASSETS.vendor;