@co0ontty/wand 1.41.4 → 1.43.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "7c55e89bdac5b0ba4588b4dc43a7dd2ab5f812ea",
-  "builtAt": "2026-05-31T01:09:26.532Z",
-  "version": "1.41.4",
+  "commit": "a2fcf61e1ef6825cb1767b63fb9593e8f6e4ecea",
+  "builtAt": "2026-05-31T02:16:53.049Z",
+  "version": "1.43.0",
   "channel": "stable"
 }

package/dist/server.js

@@ -25,6 +25,7 @@ import { installPackageGloballyAsync, resolveGlobalWandCli } from "./npm-update-
 import { repairServiceUnitAfterUpdate } from "./service-self-repair.js";
 import { computeRelaunch } from "./relaunch.js";
 import { isServiceInstalled } from "./tui/commands.js";
+import { canUseDetachedUpdateHelper, startDetachedUpdateHelper } from "./update-helper.js";
 import { registerUploadRoutes } from "./upload-routes.js";
 import { optimizePrompt, PromptOptimizeError } from "./prompt-optimizer.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
@@ -1569,31 +1570,40 @@ export async function startServer(config, configPath) {
                 installSpec = `${PKG_NAME}@latest`;
                 targetLabel = onBetaBuild ? "最新正式版" : latest;
             }
-            // beta 走 git 安装（clone + 装依赖），比 registry tarball 慢，给足超时。
-            const logLines = [];
-            try {
-                await installPackageGloballyAsync(installSpec, 300000, (line) => {
-                    logLines.push(line);
-                    process.stdout.write(`${line}\n`);
-                });
+            if (!canUseDetachedUpdateHelper()) {
+                res.status(500).json({ error: "当前平台暂不支持 Web 异步更新，请在终端运行 install.sh 更新。" });
+                return;
             }
-            catch (e) {
-                res.status(500).json({
-                    error: getErrorMessage(e, "更新失败。"),
-                    detail: logLines.join("\n").slice(-2000),
-                });
+            const helper = startDetachedUpdateHelper({
+                installSpec,
+                configPath,
+                parentPid: process.pid,
+                cliArgs: process.argv.slice(2),
+                cwd: process.cwd(),
+                env: process.env,
+                timeoutMs: 300000,
+            });
+            if (!helper.started) {
+                res.status(500).json({ error: helper.message, detail: `script=${helper.scriptPath}\nlog=${helper.logPath}` });
                 return;
             }
-            // 镜像 install.sh：装完用全局安装刷新服务 unit（ExecStart/PATH），重启才会跑到新版。
-            const repair = repairServiceUnitAfterUpdate(configPath);
-            // 装包成功后告知前端可以发起重启；前端会随即调用 /api/restart 完成自动重启。
+            process.stdout.write(`[wand] ${helper.message}\n`);
+            wsManager.emitEvent({
+                type: "notification",
+                sessionId: "__system__",
+                data: { kind: "auto-update-restart", current: PKG_VERSION, latest: targetLabel },
+            });
             res.json({
                 ok: true,
-                message: `已更新到 ${targetLabel}`,
-                restartRequired: true,
+                message: `已开始更新到 ${targetLabel}`,
+                restartRequired: false,
+                detachedUpdate: true,
                 version: targetLabel,
-                serviceRepair: repair.scope ? { repaired: repair.repaired, message: repair.message } : null,
+                logPath: helper.logPath,
             });
+            setTimeout(() => {
+                shutdownForDetachedUpdate();
+            }, 500);
         }
         catch (error) {
             res.status(500).json({ error: getErrorMessage(error, "更新失败。") });
@@ -2187,6 +2197,18 @@ export async function startServer(config, configPath) {
         // Force exit after 5s if graceful shutdown stalls
         setTimeout(() => process.exit(0), 5000);
     }
+    function shutdownForDetachedUpdate() {
+        try {
+            wss.clients.forEach((client) => client.close());
+        }
+        catch {
+            /* noop */
+        }
+        server.close(() => {
+            process.exit(0);
+        });
+        setTimeout(() => process.exit(0), 3000);
+    }
     app.post("/api/restart", async (_req, res) => {
         res.json({ ok: true, message: "服务正在重启..." });
         wsManager.emitEvent({

package/dist/update-helper.d.ts

@@ -0,0 +1,18 @@
+export interface DetachedUpdateOptions {
+    installSpec: string;
+    configPath: string;
+    parentPid: number;
+    cliArgs: string[];
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+    timeoutMs?: number;
+}
+export interface DetachedUpdateResult {
+    started: boolean;
+    scriptPath: string;
+    logPath: string;
+    pid?: number;
+    message: string;
+}
+export declare function startDetachedUpdateHelper(opts: DetachedUpdateOptions): DetachedUpdateResult;
+export declare function canUseDetachedUpdateHelper(): boolean;

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;
+}