@adhdev/daemon-standalone 1.0.39-rc.7 → 1.0.39-rc.8

package/dist/index.js

@@ -31423,9 +31423,9 @@ var require_streamx = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/b4a/index.js
+// ../../node_modules/tar-stream/node_modules/b4a/index.js
 var require_b4a2 = __commonJS({
-  "../daemon-core/node_modules/b4a/index.js"(exports2, module2) {
+  "../../node_modules/tar-stream/node_modules/b4a/index.js"(exports2, module2) {
     "use strict";
     function isBuffer(value) {
       return Buffer.isBuffer(value) || value instanceof Uint8Array;
@@ -31581,9 +31581,9 @@ var require_b4a2 = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/headers.js
+// ../../node_modules/tar-stream/headers.js
 var require_headers = __commonJS({
-  "../daemon-core/node_modules/tar-stream/headers.js"(exports2) {
+  "../../node_modules/tar-stream/headers.js"(exports2) {
     "use strict";
     var b4a = require_b4a2();
     var ZEROS = "0000000000000000000";
@@ -31844,9 +31844,9 @@ var require_headers = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/extract.js
+// ../../node_modules/tar-stream/extract.js
 var require_extract = __commonJS({
-  "../daemon-core/node_modules/tar-stream/extract.js"(exports2, module2) {
+  "../../node_modules/tar-stream/extract.js"(exports2, module2) {
     "use strict";
     var { Writable, Readable, getStreamError } = require_streamx();
     var FIFO = require_fast_fifo();
@@ -32189,9 +32189,9 @@ var require_extract = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/constants.js
+// ../../node_modules/tar-stream/constants.js
 var require_constants = __commonJS({
-  "../daemon-core/node_modules/tar-stream/constants.js"(exports2, module2) {
+  "../../node_modules/tar-stream/constants.js"(exports2, module2) {
     "use strict";
     var constants = {
       // just for envs without fs
@@ -32210,9 +32210,9 @@ var require_constants = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/pack.js
+// ../../node_modules/tar-stream/pack.js
 var require_pack = __commonJS({
-  "../daemon-core/node_modules/tar-stream/pack.js"(exports2, module2) {
+  "../../node_modules/tar-stream/pack.js"(exports2, module2) {
     "use strict";
     var { Readable, Writable, getStreamError } = require_streamx();
     var b4a = require_b4a2();
@@ -32445,9 +32445,9 @@ var require_pack = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/index.js
+// ../../node_modules/tar-stream/index.js
 var require_tar_stream = __commonJS({
-  "../daemon-core/node_modules/tar-stream/index.js"(exports2) {
+  "../../node_modules/tar-stream/index.js"(exports2) {
     "use strict";
     exports2.extract = require_extract();
     exports2.pack = require_pack();
@@ -32690,9 +32690,9 @@ var require_pump = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-fs/index.js
+// ../../node_modules/tar-fs/index.js
 var require_tar_fs = __commonJS({
-  "../daemon-core/node_modules/tar-fs/index.js"(exports2) {
+  "../../node_modules/tar-fs/index.js"(exports2) {
     "use strict";
     var tar = require_tar_stream();
     var pump = require_pump();
@@ -36528,10 +36528,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "2e7dae960e88d61879ec103eaa86df36e1671d8e" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "2e7dae96" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.39-rc.7" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-08T01:41:54.555Z" : void 0);
+      const commit = readInjected(true ? "37babf91fc649f590da3e4993d4aef18060c88d8" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "37babf91" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.39-rc.8" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-08T02:45:35.197Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -38643,6 +38643,7 @@ child.on('exit', () => process.exit(0));
     });
     var config_exports = {};
     __export2(config_exports, {
+      clearAuthCredentials: () => clearAuthCredentials,
       generateMachineId: () => generateMachineId,
       getConfigDir: () => getConfigDir2,
       getDaemonDataDir: () => getDaemonDataDir,
@@ -38879,6 +38880,13 @@ child.on('exit', () => process.exit(0));
     function resetConfig() {
       saveConfig({ ...DEFAULT_CONFIG });
     }
+    function clearAuthCredentials() {
+      const config2 = loadConfig2();
+      config2.machineSecret = void 0;
+      config2.userEmail = null;
+      config2.userName = null;
+      saveConfig(config2);
+    }
     var import_path4;
     var import_fs3;
     var import_crypto2;
@@ -77321,6 +77329,7 @@ ${lastSnapshot}`;
       classifyShadowDivergence: () => classifyShadowDivergence,
       classifyStaleDirectForPrune: () => classifyStaleDirectForPrune,
       cleanupTerminalDirectDispatches: () => cleanupTerminalDirectDispatches,
+      clearAuthCredentials: () => clearAuthCredentials,
       clearDebugTrace: () => clearDebugTrace,
       clearPendingMeshCoordinatorEvents: () => clearPendingMeshCoordinatorEvents,
       collectPendingApprovals: () => collectPendingApprovals,
@@ -90449,6 +90458,11 @@ exec "${portableNode}" "${cliEntry}" "$@"
         publishStableShimsAndPointer(layout, versionName);
         hooks.log(`Atomically activated ${versionName}`);
         restarted = hooks.restart(portableNode, stagedCliEntry);
+        if (restarted === null) {
+          hooks.log(`Activated ${targetVersion} without restarting a daemon (none was running)`);
+          await hooks.cleanup(layout, stagedPrefix);
+          return { stagedPrefix, stagedCliEntry, daemonPid: null };
+        }
         const daemonPid = restarted.pid;
         if (!daemonPid || !await hooks.waitForHealth(daemonPid, targetVersion)) {
           throw new Error("replacement daemon did not pass the health/version gate");
@@ -90512,7 +90526,10 @@ exec "${portableNode}" "${cliEntry}" "$@"
         },
         restart: (portableNode, stagedCliEntry) => {
           const restartArgv = options.restartArgv.map((arg, index) => index === 0 ? stagedCliEntry : arg);
-          if (restartArgv.length === 0) throw new Error("replacement daemon restart arguments are missing");
+          if (restartArgv.length === 0) {
+            options.log("No restart arguments provided (daemon was not running); leaving the activated version in place without starting a daemon");
+            return null;
+          }
           const child = (0, import_child_process7.spawn)(portableNode, restartArgv, {
             detached: true,
             stdio: "ignore",
@@ -90613,6 +90630,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
     }
     var import_session_host_core6 = require_dist();
     init_config();
+    init_track_identity();
     var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
     function resolveInstanceDir(configDir = getConfigDir2()) {
       const base = path26.basename(configDir).trim();
@@ -91104,8 +91122,9 @@ ${marker}`,
             `Cannot upgrade: owned processes still running under current prefix: ${preStop.survivors.map((s2) => s2.pid).join(", ")}`
           );
         }
+        let atomicResult;
         try {
-          await performWindowsAtomicUpgrade({
+          atomicResult = await performWindowsAtomicUpgrade({
             layout: windowsInstallerLayout,
             packageName: payload.packageName,
             targetVersion: payload.targetVersion,
@@ -91130,7 +91149,13 @@ ${marker}`,
           throw error48;
         }
         clearUpgradeFailureNotice();
-        appendUpgradeLog("Installer-managed Windows atomic upgrade completed");
+        if (atomicResult.daemonPid === null) {
+          appendUpgradeLog(
+            `Installer-managed Windows atomic upgrade completed (no daemon was running, so none was started \u2014 run \`${IDENTITY.binaryName} daemon\` to start it)`
+          );
+        } else {
+          appendUpgradeLog("Installer-managed Windows atomic upgrade completed");
+        }
         return;
       }
       await stopForeignNativeAddonHolders(installCommand.surface.packageRoot, { parentPid: payload.parentPid });
@@ -115152,6 +115177,7 @@ ${e?.stderr || ""}`;
       return handle;
     }
     var fs44 = __toESM2(require("fs"));
+    var import_node_os2 = require("os");
     var import_path19 = require("path");
     init_logger();
     init_dist();
@@ -115182,6 +115208,19 @@ ${e?.stderr || ""}`;
       const v = mesh?.policy?.worktreeBaseDir;
       return typeof v === "string" && v.trim() ? v.trim() : void 0;
     }
+    var TRACK_CONFIG_DIR_NAMES = [".adhdev", ".adhdev-preview"];
+    function looksLikeCrossTrackWorktreePath(actualPath, normalizePath2) {
+      const home = normalizePath2((0, import_node_os2.homedir)());
+      return TRACK_CONFIG_DIR_NAMES.some((trackDirName) => {
+        const trackWorktreesDir = (0, import_path19.join)(home, trackDirName, "worktrees");
+        return actualPath === normalizePath2(trackWorktreesDir) || actualPath.startsWith(normalizePath2(trackWorktreesDir) + import_path19.sep);
+      });
+    }
+    function unexpectedPathRecoveryHint(actualPath, normalizePath2, suffix) {
+      const base = "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree.";
+      const legacyHint = looksLikeCrossTrackWorktreePath(actualPath, normalizePath2) ? " This path matches the layout used before worktree paths became build-track-aware (oss c24ae254) and is likely a legacy worktree from an older daemon version \u2014 mesh_remove_node will not remove it automatically. To clean it up: run `git worktree remove --force '" + actualPath + "'` directly, then retry mesh_remove_node so it can drop the now-missing-path node from the mesh registry." : "";
+      return base + legacyHint + suffix;
+    }
     function sessionMatchesMeshNode(self, record2, node, nodeId, sessionIds) {
       const sessionId = typeof record2?.sessionId === "string" ? record2.sessionId : "";
       if (!sessionId) return false;
@@ -115266,7 +115305,7 @@ ${e?.stderr || ""}`;
           ok: false,
           code: "mesh_worktree_cleanup_unexpected_path",
           error: `Refusing to remove worktree '${workspace}' because it is not at the expected managed path '${expectedPaths[0]}'`,
-          recoveryHint: "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree." + sessionPreservedNote
+          recoveryHint: unexpectedPathRecoveryHint(actualPath, normalizePath2, sessionPreservedNote)
         };
       }
       const entries = await listWorktrees2(repoRoot);
@@ -115362,7 +115401,7 @@ ${e?.stderr || ""}`;
           success: false,
           code: "mesh_worktree_cleanup_unexpected_path",
           error: `Refusing to remove worktree '${workspace}' because it is not at the expected managed path '${expectedPaths[0]}'`,
-          recoveryHint: "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree."
+          recoveryHint: unexpectedPathRecoveryHint(actualPath, normalizePath2, "")
         };
       }
       const entries = await listWorktrees2(repoRoot);