@co0ontty/wand 2.11.0 → 2.11.1

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "3354e091c2cf28e027f1a0b4b4b3d51cd72f4313",
-  "builtAt": "2026-07-12T01:28:23.178Z",
-  "version": "2.11.0",
+  "commit": "91ceeeaabff61dfaa09abd5bf1327dda55f51879",
+  "builtAt": "2026-07-12T01:48:23.296Z",
+  "version": "2.11.1",
   "channel": "stable"
 }

package/dist/server.js

@@ -88,6 +88,7 @@ function readBuildInfo() {
 }
 const BUILD_INFO = readBuildInfo();
 const DISPLAY_VERSION = BUILD_INFO.version || PKG_VERSION;
+const SERVER_INSTANCE_ID = crypto.randomUUID();
 let cachedGitHubApk = null;
 let gitHubApkCacheTs = 0;
 const GITHUB_APK_CACHE_TTL = 10 * 60 * 1000; // 10 minutes
@@ -1375,6 +1376,8 @@ export async function startServer(config, configPath) {
             latestVersion: cachedUpdateInfo?.latest ?? null,
             updateChannel: getUpdateChannel(),
             currentVersion: DISPLAY_VERSION,
+            packageVersion: PKG_VERSION,
+            serverInstanceId: SERVER_INSTANCE_ID,
         });
     });
     // ── Browser extension password vault endpoints ──
@@ -1874,7 +1877,12 @@ export async function startServer(config, configPath) {
             wsManager.emitEvent({
                 type: "notification",
                 sessionId: "__system__",
-                data: { kind: "auto-update-restart", current: info.current, latest: targetLabel },
+                data: {
+                    kind: "auto-update-restart",
+                    current: info.current,
+                    latest: targetLabel,
+                    previousInstanceId: SERVER_INSTANCE_ID,
+                },
             });
             res.json({
                 ok: true,
@@ -1882,6 +1890,7 @@ export async function startServer(config, configPath) {
                 restartRequired: false,
                 detachedUpdate: true,
                 version: targetLabel,
+                previousInstanceId: SERVER_INSTANCE_ID,
                 logPath: helper.logPath,
             });
         }
@@ -2612,7 +2621,12 @@ export async function startServer(config, configPath) {
         wsManager.emitEvent({
             type: "notification",
             sessionId: "__system__",
-            data: { kind: "auto-update-start", current: info.current, latest: info.latest },
+            data: {
+                kind: "auto-update-start",
+                current: info.current,
+                latest: info.latest,
+                previousInstanceId: SERVER_INSTANCE_ID,
+            },
         });
         try {
             await npmInstallGlobal(info.installSpec, 120000);
@@ -2624,7 +2638,12 @@ export async function startServer(config, configPath) {
             wsManager.emitEvent({
                 type: "notification",
                 sessionId: "__system__",
-                data: { kind: "auto-update-restart", current: info.current, latest: info.latest },
+                data: {
+                    kind: "auto-update-restart",
+                    current: info.current,
+                    latest: info.latest,
+                    previousInstanceId: SERVER_INSTANCE_ID,
+                },
             });
             // Restart after a brief delay
             setTimeout(() => {

package/dist/update-helper.js

@@ -29,6 +29,27 @@ function detectInstalledServiceScopes() {
     }
     return [];
 }
+function readLaunchdJobPid(domain) {
+    const result = spawnSync("launchctl", ["print", `${domain}/com.wand.web`], {
+        encoding: "utf8",
+        timeout: 5_000,
+    });
+    if (result.status !== 0)
+        return null;
+    const match = (result.stdout || "").match(/(?:^|\n)\s*pid = (\d+)\s*(?:\n|$)/);
+    if (!match)
+        return null;
+    const pid = Number(match[1]);
+    return Number.isSafeInteger(pid) && pid > 1 ? pid : null;
+}
+function detectActiveDarwinServiceScope(pid) {
+    if (readLaunchdJobPid("system") === pid)
+        return "system";
+    const uid = typeof process.getuid === "function" ? process.getuid() : null;
+    if (uid !== null && readLaunchdJobPid(`gui/${uid}`) === pid)
+        return "user";
+    return null;
+}
 /** A manifest alone is not enough: only a process actually launched by its manager may rely on auto-restart. */
 export function resolveManagedServiceScope(installedScope, platform = process.platform, env = process.env, pid = process.pid) {
     if (platform === "darwin") {
@@ -53,7 +74,13 @@ export function resolveManagedServiceScopeCandidates(installedScopes, platform =
     return managedScope;
 }
 function detectManagedServiceScope() {
-    return resolveManagedServiceScopeCandidates(detectInstalledServiceScopes());
+    const installedScopes = detectInstalledServiceScopes();
+    if (process.platform === "darwin" && process.env.XPC_SERVICE_NAME === "com.wand.web") {
+        const activeScope = detectActiveDarwinServiceScope(process.pid);
+        if (activeScope && installedScopes.includes(activeScope))
+            return activeScope;
+    }
+    return resolveManagedServiceScopeCandidates(installedScopes);
 }
 export function isStableServiceEntrypoint(entrypoint, stableBin) {
     if (!entrypoint || !stableBin)
@@ -250,6 +277,16 @@ function spawnDetached(scriptPath, _logPath, env, serviceScope) {
                 stdio: "ignore",
                 env: baseEnv,
             });
+            child.once("error", (error) => {
+                try {
+                    writeFileSync(_logPath, `[wand-update] helper spawn failed: ${error.message}\n`, { flag: "a" });
+                }
+                catch {
+                    /* best effort */
+                }
+            });
+            if (!child.pid)
+                return null;
             child.unref();
             return { pid: child.pid, method };
         }
@@ -288,7 +325,8 @@ function spawnDetached(scriptPath, _logPath, env, serviceScope) {
         }
     }
     if (process.platform === "darwin") {
-        const result = trySpawn("nohup", [resolveBashPath(), scriptPath], "nohup");
+        const nohupPath = existsSync("/usr/bin/nohup") ? "/usr/bin/nohup" : "nohup";
+        const result = trySpawn(nohupPath, [resolveBashPath(), scriptPath], "nohup");
         if (result)
             return result;
     }
@@ -326,6 +364,7 @@ export function startDetachedUpdateHelper(opts) {
         mode: 0o700,
     });
     chmodSync(scriptPath, 0o700);
+    writeFileSync(logPath, `[wand-update] helper queued at ${new Date().toISOString()}\n`, "utf8");
     const spawned = spawnDetached(scriptPath, logPath, opts.env, serviceScope);
     if (!spawned) {
         return {