@co0ontty/wand 1.41.2 → 1.41.3

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "14a762e2a36d3d1d7eb73887c33456f8bd7b3a0e",
-  "builtAt": "2026-05-30T23:17:58.441Z",
-  "version": "1.41.2",
+  "commit": "1f4df3d175e7fca737cf75fa45388d55dc870531",
+  "builtAt": "2026-05-30T23:40:01.415Z",
+  "version": "1.41.3",
   "channel": "stable"
 }

package/dist/npm-update-utils.js

@@ -12,7 +12,7 @@
  * 如果第一次安装仍然撞上 ENOTEMPTY，清理后重试；再不行就 uninstall + force install。
  */
 import { exec, spawnSync } from "node:child_process";
-import { existsSync, readdirSync, rmSync, statSync } from "node:fs";
+import { chmodSync, existsSync, readdirSync, rmSync, statSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 import { promisify } from "node:util";
@@ -77,6 +77,68 @@ export function cleanupNpmLeftovers() {
     }
     return { removed, errors };
 }
+const REQUIRED_RUNTIME_FILES = [
+    "package.json",
+    path.join("dist", "cli.js"),
+    path.join("dist", "server.js"),
+    path.join("dist", "web-ui", "index.js"),
+    path.join("dist", "web-ui", "scripts.js"),
+    path.join("dist", "web-ui", "styles.js"),
+    path.join("dist", "web-ui", "content", "scripts.js"),
+    path.join("dist", "web-ui", "content", "styles.css"),
+    path.join("dist", "web-ui", "content", "vendor", "wterm", "wterm.bundle.js"),
+    path.join("dist", "web-ui", "content", "vendor", "qrcode", "qrcode.bundle.js"),
+];
+function getGlobalPackageDir() {
+    const root = getNpmGlobalRoot();
+    return root ? path.join(root, PACKAGE_SCOPE, PACKAGE_BASENAME) : null;
+}
+function validateGlobalWandInstall() {
+    const packageDir = getGlobalPackageDir();
+    if (!packageDir) {
+        return { ok: false, message: "无法解析 npm 全局安装目录。" };
+    }
+    const missing = [];
+    for (const rel of REQUIRED_RUNTIME_FILES) {
+        const fullPath = path.join(packageDir, rel);
+        try {
+            if (!statSync(fullPath).isFile()) {
+                missing.push(rel);
+            }
+        }
+        catch {
+            missing.push(rel);
+        }
+    }
+    if (missing.length > 0) {
+        return {
+            ok: false,
+            message: `全局 wand 安装不完整: ${packageDir} 缺少 ${missing.join(", ")}`,
+        };
+    }
+    if (process.platform !== "win32") {
+        const cliPath = path.join(packageDir, "dist", "cli.js");
+        try {
+            const mode = statSync(cliPath).mode;
+            if ((mode & 0o111) === 0) {
+                chmodSync(cliPath, mode | 0o755);
+            }
+        }
+        catch (err) {
+            return {
+                ok: false,
+                message: `全局 wand CLI 无法设置执行权限: ${cliPath}: ${err instanceof Error ? err.message : String(err)}`,
+            };
+        }
+    }
+    return { ok: true, packageDir };
+}
+function assertGlobalWandInstallComplete() {
+    const result = validateGlobalWandInstall();
+    if (!result.ok) {
+        throw new Error(result.message);
+    }
+}
 /**
  * 异步版本的全局安装：
  * 1. 清理残留
@@ -99,26 +161,35 @@ export async function installPackageGloballyAsync(pkg, timeoutMs, log) {
     }
     try {
         await execAsync(`npm install -g ${pkg}`, { timeout: timeoutMs });
+        assertGlobalWandInstallComplete();
         return;
     }
     catch (error) {
         const msg = error instanceof Error ? error.message : String(error);
         if (!/ENOTEMPTY|EEXIST/.test(msg)) {
-            throw error;
+            if (/全局 wand 安装不完整|无法解析 npm 全局安装目录/.test(msg)) {
+                note(`[wand] npm install 后安装目录不完整，尝试强制重装...`);
+            }
+            else {
+                throw error;
+            }
         }
-        note(`[wand] npm install 遇到 ENOTEMPTY/EEXIST，清理后重试一次...`);
-    }
-    cleanupNpmLeftovers();
-    try {
-        await execAsync(`npm install -g ${pkg}`, { timeout: timeoutMs });
-        return;
-    }
-    catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        if (!/ENOTEMPTY|EEXIST/.test(msg)) {
-            throw error;
+        else {
+            note(`[wand] npm install 遇到 ENOTEMPTY/EEXIST，清理后重试一次...`);
+            cleanupNpmLeftovers();
+            try {
+                await execAsync(`npm install -g ${pkg}`, { timeout: timeoutMs });
+                assertGlobalWandInstallComplete();
+                return;
+            }
+            catch (retryError) {
+                const retryMsg = retryError instanceof Error ? retryError.message : String(retryError);
+                if (!/ENOTEMPTY|EEXIST|全局 wand 安装不完整|无法解析 npm 全局安装目录/.test(retryMsg)) {
+                    throw retryError;
+                }
+            }
+            note(`[wand] 重试仍失败，尝试先卸载再强制安装...`);
         }
-        note(`[wand] 重试仍失败，尝试先卸载再强制安装...`);
     }
     // 终极兜底：uninstall + force install
     // 卸载用固定包名 PACKAGE_NAME，而不是从 install spec 反推：spec 可能是 git
@@ -131,6 +202,7 @@ export async function installPackageGloballyAsync(pkg, timeoutMs, log) {
     }
     cleanupNpmLeftovers();
     await execAsync(`npm install -g --force ${pkg}`, { timeout: timeoutMs });
+    assertGlobalWandInstallComplete();
 }
 /**
  * 同步版本，给 TUI installUpdate 用。
@@ -139,28 +211,40 @@ export async function installPackageGloballyAsync(pkg, timeoutMs, log) {
  */
 export function installPackageGloballySync(pkg, timeoutMs) {
     const attempts = [];
+    const withValidation = (res) => {
+        if (res.status !== 0)
+            return res;
+        const validation = validateGlobalWandInstall();
+        if (validation.ok)
+            return res;
+        return {
+            status: 1,
+            stdout: res.stdout,
+            stderr: `${res.stderr ? `${res.stderr}\n` : ""}${validation.message}`,
+        };
+    };
     const tryInstall = (extra) => {
         const args = ["install", "-g", ...extra, pkg];
         attempts.push(`npm ${args.join(" ")}`);
         const r = spawnSync("npm", args, { encoding: "utf8", timeout: timeoutMs });
-        return {
+        return withValidation({
             status: r.status,
             stdout: r.stdout || "",
             stderr: r.stderr || "",
-        };
+        });
     };
     cleanupNpmLeftovers();
     let res = tryInstall([]);
     if (res.status === 0)
         return { ...res, attempts };
-    const hitENOTEMPTY = (r) => /ENOTEMPTY|EEXIST/.test(r.stdout + r.stderr);
-    if (!hitENOTEMPTY(res))
+    const hitRecoverableInstallError = (r) => /ENOTEMPTY|EEXIST|全局 wand 安装不完整|无法解析 npm 全局安装目录/.test(r.stdout + r.stderr);
+    if (!hitRecoverableInstallError(res))
         return { ...res, attempts };
     cleanupNpmLeftovers();
     res = tryInstall([]);
     if (res.status === 0)
         return { ...res, attempts };
-    if (!hitENOTEMPTY(res))
+    if (!hitRecoverableInstallError(res))
         return { ...res, attempts };
     // 终极兜底（卸载用固定包名，兼容 git spec，见 async 版同样注释）
     attempts.push(`npm uninstall -g ${PACKAGE_NAME}`);

package/dist/web-ui/scripts.js

@@ -10,10 +10,24 @@ function escapeHtml(value) {
         .replace(/'/g, "'");
 }
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// Cache the script content
+let _scriptCache = null;
+let _scriptCacheMtimeMs = 0;
 export function getScriptContent(configPath) {
     const scriptPath = path.join(__dirname, "content", "scripts.js");
-    const scriptContent = fs.readFileSync(scriptPath, "utf-8");
+    try {
+        const stat = fs.statSync(scriptPath);
+        if (_scriptCache === null || stat.mtimeMs !== _scriptCacheMtimeMs) {
+            _scriptCache = fs.readFileSync(scriptPath, "utf-8");
+            _scriptCacheMtimeMs = stat.mtimeMs;
+        }
+    }
+    catch {
+        // During self-update npm can briefly replace the global package directory.
+        // Keep serving the already-loaded UI until /api/restart switches process.
+        if (_scriptCache === null) {
+            _scriptCache = fs.readFileSync(scriptPath, "utf-8");
+        }
+    }
     // Inject the config path
-    return scriptContent.replace("${escapeHtml(configPath)}", escapeHtml(configPath));
+    return _scriptCache.replace("${escapeHtml(configPath)}", escapeHtml(configPath));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.41.2",
+  "version": "1.41.3",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {
@@ -16,7 +16,7 @@
   ],
   "preferGlobal": true,
   "scripts": {
-    "build": "node scripts/bundle-wterm.js && node scripts/bundle-qrcode.js && tsc -p tsconfig.json && npm run build:copy-content && node scripts/stamp-build-info.js",
+    "build": "node scripts/bundle-wterm.js && node scripts/bundle-qrcode.js && tsc -p tsconfig.json && npm run build:copy-content && node scripts/stamp-build-info.js && node scripts/fix-dist-permissions.js",
     "build:copy-content": "cp -r src/web-ui/content dist/web-ui/",
     "dev": "tsx src/cli.ts web",
     "check": "tsc --noEmit -p tsconfig.json",