adhdev 0.9.75 → 0.9.76-rc.10

package/dist/index.js

@@ -2387,7 +2387,7 @@ function buildNodeConfigSection(mesh) {
   for (const n of mesh.nodes) {
     const labels = [];
     if (n.isLocalWorktree) labels.push("worktree");
-    if (n.policy.readOnly) labels.push("read-only");
+    if (n.policy?.readOnly) labels.push("read-only");
     const suffix = labels.length ? ` [${labels.join(", ")}]` : "";
     lines.push(`- **${n.workspace}** (${n.id})${suffix}`);
   }
@@ -2433,18 +2433,20 @@ var init_coordinator_prompt = __esm({
 3. **Delegate** \u2014 For each task:
    a. Pick the best node (consider: health, dirty state, current workload).
    b. If no session exists, call \`mesh_launch_session\` to start one.
-   c. Call \`mesh_send_task\` with a clear, self-contained natural-language instruction.
+   c. Call \`mesh_send_task\` with a **complete, self-contained** instruction that includes all context the agent needs (file paths, line numbers, what to change, why). Do not send partial instructions expecting future follow-up.
 4. **Monitor** \u2014 Periodically call \`mesh_read_chat\` to check progress. Handle approvals via \`mesh_approve\`.
 5. **Verify** \u2014 When a task reports completion, call \`mesh_git_status\` to verify changes were made.
 6. **Checkpoint** \u2014 Call \`mesh_checkpoint\` to save the work.
 7. **Report** \u2014 Summarize what was done, what changed, and any issues.`;
     RULES_SECTION = `## Rules
 
-- **Be conversational.** Delegate work the way a tech lead would \u2014 clear, specific instructions in natural language.
-- **Don't inspect code.** Trust the agent's output. Verify via git diff/status, not by reading source files.
+- **Minimize coordinator context.** The coordinator's job is routing, not implementing. Do not read source files, run commands, or analyze code directly \u2014 delegate all of that to node agents. Your context should stay lean.
+- **Delegate analysis too.** If you need to understand a bug or explore the codebase, send that investigation as a task to a node. Do not do it yourself.
+- **Front-load the task message.** When calling \`mesh_send_task\`, include everything the agent needs: what files to touch, what the problem is, what the fix should look like. The agent won't ask follow-up questions.
+- **Don't inspect code.** Trust the agent's output. Verify via \`mesh_git_status\`, not by reading source files.
 - **Don't over-parallelize.** Start with 1-2 concurrent tasks. Scale up if they succeed.
 - **Handle failures gracefully.** If a task fails, read the chat to understand why, then retry or reassign.
-- **Keep the user informed.** Report progress after each delegation round.
+- **Keep the user informed.** Report progress after each delegation round \u2014 one or two sentences, not a narration.
 - **Respect node capabilities.** Don't send build tasks to read-only nodes. Don't push from nodes that aren't allowed to.
 - **Never fabricate tool results.** Always call the actual tool; never pretend you did.`;
   }
@@ -8395,6 +8397,14 @@ function getActiveChatOptions(profile) {
   if (profile === "full") return {};
   return LIVE_STATUS_ACTIVE_CHAT_OPTIONS;
 }
+function resolveSessionStatus(activeChat, providerStatus) {
+  const chatStatus = normalizeManagedStatus(activeChat?.status, { activeModal: activeChat?.activeModal || null });
+  const topLevelStatus = normalizeManagedStatus(providerStatus, { activeModal: activeChat?.activeModal || null });
+  if (chatStatus === "waiting_approval" || topLevelStatus === "waiting_approval") return "waiting_approval";
+  if (chatStatus === "generating" || topLevelStatus === "generating") return "generating";
+  if (topLevelStatus !== "idle") return topLevelStatus;
+  return chatStatus;
+}
 function shouldIncludeSessionControls(profile) {
   return profile !== "live";
 }
@@ -8450,9 +8460,7 @@ function buildIdeWorkspaceSession(state, cdpManagers, options) {
     providerName: state.name,
     kind: "workspace",
     transport: "cdp-page",
-    status: normalizeManagedStatus(activeChat?.status || state.status, {
-      activeModal: activeChat?.activeModal || null
-    }),
+    status: resolveSessionStatus(activeChat, state.status),
     title,
     workspace,
     ...git && { git },
@@ -8487,9 +8495,7 @@ function buildExtensionAgentSession(parent, ext, options) {
     providerSessionId: ext.providerSessionId,
     kind: "agent",
     transport: "cdp-webview",
-    status: normalizeManagedStatus(activeChat?.status || ext.status, {
-      activeModal: activeChat?.activeModal || null
-    }),
+    status: resolveSessionStatus(activeChat, ext.status),
     title: activeChat?.title || ext.name,
     workspace,
     ...git && { git },
@@ -8539,9 +8545,7 @@ function buildCliSession(state, options) {
     providerSessionId: state.providerSessionId,
     kind: "agent",
     transport: "pty",
-    status: normalizeManagedStatus(activeChat?.status || state.status, {
-      activeModal: activeChat?.activeModal || null
-    }),
+    status: resolveSessionStatus(activeChat, state.status),
     title: activeChat?.title || state.name,
     workspace,
     ...git && { git },
@@ -8589,9 +8593,7 @@ function buildAcpSession(state, options) {
     providerName: state.name,
     kind: "agent",
     transport: "acp",
-    status: normalizeManagedStatus(activeChat?.status || state.status, {
-      activeModal: activeChat?.activeModal || null
-    }),
+    status: resolveSessionStatus(activeChat, state.status),
     title: activeChat?.title || state.name,
     workspace,
     ...git && { git },
@@ -13676,6 +13678,11 @@ var init_provider_cli_adapter = __esm({
         const currentSnapshot = normalizeScreenSnapshot(screenText);
         const lastSnapshot = this.lastScreenSnapshot;
         if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
+        const activeScreenPattern = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel|Enter to confirm\s*[·•-]\s*Esc to cancel|\b(?:MCP servers?|tool calls?)\b[^\n\r]{0,160}\brequire approval\b/i;
+        const staleSnapshotLooksActive = activeScreenPattern.test(lastSnapshot);
+        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:Try\s+["“][^\n\r"”]+["”])?\s*(?:\n|\r|$)/.test(screenText) && !activeScreenPattern.test(screenText);
+        if (staleSnapshotLooksActive && currentScreenLooksIdle) return screenText;
+        if (currentSnapshot.length >= lastSnapshot.length) return screenText;
         return `${screenText}
 ${lastSnapshot}`;
       }
@@ -34821,7 +34828,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
   }
 });
 
-// ../../oss/packages/daemon-core/node_modules/readdirp/index.js
+// ../../oss/node_modules/readdirp/esm/index.js
 function readdirp(root, options = {}) {
   let type = options.entryType || options.type;
   if (type === "both")
@@ -34838,13 +34845,13 @@ function readdirp(root, options = {}) {
   options.root = root;
   return new ReaddirpStream(options);
 }
-var import_promises3, import_node_path, import_node_stream, EntryTypes, defaultOptions, RECURSIVE_ERROR_CODE, NORMAL_FLOW_ERRORS, ALL_TYPES, DIR_TYPES, FILE_TYPES, isNormalFlowError, wantBigintFsStats, emptyFn, normalizeFilter, ReaddirpStream;
-var init_readdirp = __esm({
-  "../../oss/packages/daemon-core/node_modules/readdirp/index.js"() {
+var import_promises3, import_node_stream, import_node_path, EntryTypes, defaultOptions, RECURSIVE_ERROR_CODE, NORMAL_FLOW_ERRORS, ALL_TYPES, DIR_TYPES, FILE_TYPES, isNormalFlowError, wantBigintFsStats, emptyFn, normalizeFilter, ReaddirpStream;
+var init_esm = __esm({
+  "../../oss/node_modules/readdirp/esm/index.js"() {
     "use strict";
     import_promises3 = require("fs/promises");
-    import_node_path = require("path");
     import_node_stream = require("stream");
+    import_node_path = require("path");
     EntryTypes = {
       FILE_TYPE: "files",
       DIR_TYPE: "directories",
@@ -34899,20 +34906,6 @@ var init_readdirp = __esm({
       return emptyFn;
     };
     ReaddirpStream = class extends import_node_stream.Readable {
-      parents;
-      reading;
-      parent;
-      _stat;
-      _maxDepth;
-      _wantsDir;
-      _wantsFile;
-      _wantsEverything;
-      _root;
-      _isDirent;
-      _statsProp;
-      _rdOptions;
-      _fileFilter;
-      _directoryFilter;
       constructor(options = {}) {
         super({
           objectMode: true,
@@ -34929,7 +34922,7 @@ var init_readdirp = __esm({
         } else {
           this._stat = statMethod;
         }
-        this._maxDepth = opts.depth != null && Number.isSafeInteger(opts.depth) ? opts.depth : defaultOptions.depth;
+        this._maxDepth = opts.depth ?? defaultOptions.depth;
         this._wantsDir = type ? DIR_TYPES.has(type) : false;
         this._wantsFile = type ? FILE_TYPES.has(type) : false;
         this._wantsEverything = type === EntryTypes.EVERYTHING_TYPE;
@@ -35060,17 +35053,17 @@ var init_readdirp = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
+// ../../oss/node_modules/chokidar/esm/handler.js
 function createFsWatchInstance(path33, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
     listener(path33);
     emitRaw(rawEvent, evPath, { watchedPath: path33 });
     if (evPath && path33 !== evPath) {
-      fsWatchBroadcast(sp.resolve(path33, evPath), KEY_LISTENERS, sp.join(path33, evPath));
+      fsWatchBroadcast(sysPath.resolve(path33, evPath), KEY_LISTENERS, sysPath.join(path33, evPath));
     }
   };
   try {
-    return (0, import_node_fs2.watch)(path33, {
+    return (0, import_fs7.watch)(path33, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -35078,14 +35071,14 @@ function createFsWatchInstance(path33, options, listener, errHandler, emitRaw) {
     return void 0;
   }
 }
-var import_node_fs2, import_promises4, import_node_os2, sp, STR_DATA, STR_END, STR_CLOSE, EMPTY_FN, pl, isWindows, isMacos, isLinux, isFreeBSD, isIBMi, EVENTS, EV, THROTTLE_MODE_WATCH, statMethods, KEY_LISTENERS, KEY_ERR, KEY_RAW, HANDLER_KEYS, binaryExtensions, isBinaryPath, foreach, addAndConvert, clearItem, delFromSet, isEmptySet, FsWatchInstances, fsWatchBroadcast, setFsWatchListener, FsWatchFileInstances, setFsWatchFileListener, NodeFsHandler;
+var import_fs7, import_promises4, sysPath, import_os3, STR_DATA, STR_END, STR_CLOSE, EMPTY_FN, pl, isWindows, isMacos, isLinux, isFreeBSD, isIBMi, EVENTS, EV, THROTTLE_MODE_WATCH, statMethods, KEY_LISTENERS, KEY_ERR, KEY_RAW, HANDLER_KEYS, binaryExtensions, isBinaryPath, foreach, addAndConvert, clearItem, delFromSet, isEmptySet, FsWatchInstances, fsWatchBroadcast, setFsWatchListener, FsWatchFileInstances, setFsWatchFileListener, NodeFsHandler;
 var init_handler2 = __esm({
-  "../../oss/packages/daemon-core/node_modules/chokidar/handler.js"() {
+  "../../oss/node_modules/chokidar/esm/handler.js"() {
     "use strict";
-    import_node_fs2 = require("fs");
+    import_fs7 = require("fs");
     import_promises4 = require("fs/promises");
-    import_node_os2 = require("os");
-    sp = __toESM(require("path"), 1);
+    sysPath = __toESM(require("path"), 1);
+    import_os3 = require("os");
     STR_DATA = "data";
     STR_END = "end";
     STR_CLOSE = "close";
@@ -35096,7 +35089,7 @@ var init_handler2 = __esm({
     isMacos = pl === "darwin";
     isLinux = pl === "linux";
     isFreeBSD = pl === "freebsd";
-    isIBMi = (0, import_node_os2.type)() === "OS400";
+    isIBMi = (0, import_os3.type)() === "OS400";
     EVENTS = {
       ALL: "all",
       READY: "ready",
@@ -35378,7 +35371,7 @@ var init_handler2 = __esm({
       "zip",
       "zipx"
     ]);
-    isBinaryPath = (filePath) => binaryExtensions.has(sp.extname(filePath).slice(1).toLowerCase());
+    isBinaryPath = (filePath) => binaryExtensions.has(sysPath.extname(filePath).slice(1).toLowerCase());
     foreach = (val, fn) => {
       if (val instanceof Set) {
         val.forEach(fn);
@@ -35486,7 +35479,7 @@ var init_handler2 = __esm({
       let cont = FsWatchFileInstances.get(fullPath);
       const copts = cont && cont.options;
       if (copts && (copts.persistent < options.persistent || copts.interval > options.interval)) {
-        (0, import_node_fs2.unwatchFile)(fullPath);
+        (0, import_fs7.unwatchFile)(fullPath);
         cont = void 0;
       }
       if (cont) {
@@ -35497,7 +35490,7 @@ var init_handler2 = __esm({
           listeners: listener,
           rawEmitters: rawEmitter,
           options,
-          watcher: (0, import_node_fs2.watchFile)(fullPath, options, (curr, prev) => {
+          watcher: (0, import_fs7.watchFile)(fullPath, options, (curr, prev) => {
             foreach(cont.rawEmitters, (rawEmitter2) => {
               rawEmitter2(EV.CHANGE, fullPath, { curr, prev });
             });
@@ -35514,15 +35507,13 @@ var init_handler2 = __esm({
         delFromSet(cont, KEY_RAW, rawEmitter);
         if (isEmptySet(cont.listeners)) {
           FsWatchFileInstances.delete(fullPath);
-          (0, import_node_fs2.unwatchFile)(fullPath);
+          (0, import_fs7.unwatchFile)(fullPath);
           cont.options = cont.watcher = void 0;
           Object.freeze(cont);
         }
       };
     };
     NodeFsHandler = class {
-      fsw;
-      _boundHandleError;
       constructor(fsW) {
         this.fsw = fsW;
         this._boundHandleError = (error48) => fsW._handleError(error48);
@@ -35535,11 +35526,11 @@ var init_handler2 = __esm({
        */
       _watchWithNodeFs(path33, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path33);
-        const basename9 = sp.basename(path33);
+        const directory = sysPath.dirname(path33);
+        const basename9 = sysPath.basename(path33);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename9);
-        const absolutePath = sp.resolve(path33);
+        const absolutePath = sysPath.resolve(path33);
         const options = {
           persistent: opts.persistent
         };
@@ -35570,8 +35561,8 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname11 = sp.dirname(file2);
-        const basename9 = sp.basename(file2);
+        const dirname11 = sysPath.dirname(file2);
+        const basename9 = sysPath.basename(file2);
         const parent = this.fsw._getWatchedDir(dirname11);
         let prevStats = stats;
         if (parent.has(basename9))
@@ -35662,9 +35653,8 @@ var init_handler2 = __esm({
         this.fsw._symlinkPaths.set(full, true);
       }
       _handleRead(directory, initialAdd, wh, target, dir, depth, throttler) {
-        directory = sp.join(directory, "");
-        const throttleKey = target ? `${directory}:${target}` : directory;
-        throttler = this.fsw._throttle("readdir", throttleKey, 1e3);
+        directory = sysPath.join(directory, "");
+        throttler = this.fsw._throttle("readdir", directory, 1e3);
         if (!throttler)
           return;
         const previous = this.fsw._getWatchedDir(wh.path);
@@ -35681,7 +35671,7 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path33 = sp.join(directory, item);
+          let path33 = sysPath.join(directory, item);
           current.add(item);
           if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path33, item)) {
             return;
@@ -35692,7 +35682,7 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path33 = sp.join(dir, sp.relative(dir, path33));
+            path33 = sysPath.join(dir, sysPath.relative(dir, path33));
             this._addToNodeFs(path33, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
@@ -35729,12 +35719,12 @@ var init_handler2 = __esm({
        * @returns closer for the watcher instance.
        */
       async _handleDir(dir, stats, initialAdd, depth, target, wh, realpath4) {
-        const parentDir = this.fsw._getWatchedDir(sp.dirname(dir));
-        const tracked = parentDir.has(sp.basename(dir));
+        const parentDir = this.fsw._getWatchedDir(sysPath.dirname(dir));
+        const tracked = parentDir.has(sysPath.basename(dir));
         if (!(initialAdd && this.fsw.options.ignoreInitial) && !target && !tracked) {
           this.fsw._emit(EV.ADD_DIR, dir, stats);
         }
-        parentDir.add(sp.basename(dir));
+        parentDir.add(sysPath.basename(dir));
         this.fsw._getWatchedDir(dir);
         let throttler;
         let closer;
@@ -35784,7 +35774,7 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path33);
+            const absPath = sysPath.resolve(path33);
             const targetPath = follow ? await (0, import_promises4.realpath)(path33) : path33;
             if (this.fsw.closed)
               return;
@@ -35798,14 +35788,14 @@ var init_handler2 = __esm({
             const targetPath = follow ? await (0, import_promises4.realpath)(path33) : path33;
             if (this.fsw.closed)
               return;
-            const parent = sp.dirname(wh.watchPath);
+            const parent = sysPath.dirname(wh.watchPath);
             this.fsw._getWatchedDir(parent).add(wh.watchPath);
             this.fsw._emit(EV.ADD, wh.watchPath, stats);
             closer = await this._handleDir(parent, stats, initialAdd, depth, path33, wh, targetPath);
             if (this.fsw.closed)
               return;
             if (targetPath !== void 0) {
-              this.fsw._symlinkPaths.set(sp.resolve(path33), targetPath);
+              this.fsw._symlinkPaths.set(sysPath.resolve(path33), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
@@ -35825,7 +35815,7 @@ var init_handler2 = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/node_modules/chokidar/index.js
+// ../../oss/node_modules/chokidar/esm/index.js
 function arrify(item) {
   return Array.isArray(item) ? item : [item];
 }
@@ -35841,11 +35831,11 @@ function createPattern(matcher) {
       if (matcher.path === string4)
         return true;
       if (matcher.recursive) {
-        const relative5 = sp2.relative(matcher.path, string4);
+        const relative5 = sysPath2.relative(matcher.path, string4);
         if (!relative5) {
           return false;
         }
-        return !relative5.startsWith("..") && !sp2.isAbsolute(relative5);
+        return !relative5.startsWith("..") && !sysPath2.isAbsolute(relative5);
       }
       return false;
     };
@@ -35855,12 +35845,14 @@ function createPattern(matcher) {
 function normalizePath(path33) {
   if (typeof path33 !== "string")
     throw new Error("string expected");
-  path33 = sp2.normalize(path33);
+  path33 = sysPath2.normalize(path33);
   path33 = path33.replace(/\\/g, "/");
   let prepend = false;
   if (path33.startsWith("//"))
     prepend = true;
-  path33 = path33.replace(DOUBLE_SLASH_RE, "/");
+  const DOUBLE_SLASH_RE2 = /\/\//;
+  while (path33.match(DOUBLE_SLASH_RE2))
+    path33 = path33.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
     path33 = "/" + path33;
   return path33;
@@ -35893,15 +35885,15 @@ function watch(paths, options = {}) {
   watcher.add(paths);
   return watcher;
 }
-var import_node_events, import_node_fs3, import_promises5, sp2, SLASH, SLASH_SLASH, ONE_DOT, TWO_DOTS, STRING_TYPE, BACK_SLASH_RE, DOUBLE_SLASH_RE, DOT_RE, REPLACER_RE, isMatcherObject, unifyPaths, toUnix, normalizePathToUnix, normalizeIgnored, getAbsolutePath, EMPTY_SET, DirEntry, STAT_METHOD_F, STAT_METHOD_L, WatchHelper, FSWatcher;
-var init_chokidar = __esm({
-  "../../oss/packages/daemon-core/node_modules/chokidar/index.js"() {
+var import_fs8, import_promises5, import_events, sysPath2, SLASH, SLASH_SLASH, ONE_DOT, TWO_DOTS, STRING_TYPE, BACK_SLASH_RE, DOUBLE_SLASH_RE, DOT_RE, REPLACER_RE, isMatcherObject, unifyPaths, toUnix, normalizePathToUnix, normalizeIgnored, getAbsolutePath, EMPTY_SET, DirEntry, STAT_METHOD_F, STAT_METHOD_L, WatchHelper, FSWatcher;
+var init_esm2 = __esm({
+  "../../oss/node_modules/chokidar/esm/index.js"() {
     "use strict";
-    import_node_events = require("events");
-    import_node_fs3 = require("fs");
+    import_fs8 = require("fs");
     import_promises5 = require("fs/promises");
-    sp2 = __toESM(require("path"), 1);
-    init_readdirp();
+    import_events = require("events");
+    sysPath2 = __toESM(require("path"), 1);
+    init_esm();
     init_handler2();
     SLASH = "/";
     SLASH_SLASH = "//";
@@ -35909,7 +35901,7 @@ var init_chokidar = __esm({
     TWO_DOTS = "..";
     STRING_TYPE = "string";
     BACK_SLASH_RE = /\\/g;
-    DOUBLE_SLASH_RE = /\/\//g;
+    DOUBLE_SLASH_RE = /\/\//;
     DOT_RE = /\..*\.(sw[px])$|~$|\.subl.*\.tmp/;
     REPLACER_RE = /^\.[/\\]/;
     isMatcherObject = (matcher) => typeof matcher === "object" && matcher !== null && !(matcher instanceof RegExp);
@@ -35926,31 +35918,30 @@ var init_chokidar = __esm({
       if (str.startsWith(SLASH_SLASH)) {
         prepend = true;
       }
-      str = str.replace(DOUBLE_SLASH_RE, SLASH);
+      while (str.match(DOUBLE_SLASH_RE)) {
+        str = str.replace(DOUBLE_SLASH_RE, SLASH);
+      }
       if (prepend) {
         str = SLASH + str;
       }
       return str;
     };
-    normalizePathToUnix = (path33) => toUnix(sp2.normalize(toUnix(path33)));
+    normalizePathToUnix = (path33) => toUnix(sysPath2.normalize(toUnix(path33)));
     normalizeIgnored = (cwd = "") => (path33) => {
       if (typeof path33 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path33) ? path33 : sp2.join(cwd, path33));
+        return normalizePathToUnix(sysPath2.isAbsolute(path33) ? path33 : sysPath2.join(cwd, path33));
       } else {
         return path33;
       }
     };
     getAbsolutePath = (path33, cwd) => {
-      if (sp2.isAbsolute(path33)) {
+      if (sysPath2.isAbsolute(path33)) {
         return path33;
       }
-      return sp2.join(cwd, path33);
+      return sysPath2.join(cwd, path33);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
-      path;
-      _removeWatcher;
-      items;
       constructor(dir, removeWatcher) {
         this.path = dir;
         this._removeWatcher = removeWatcher;
@@ -35975,7 +35966,7 @@ var init_chokidar = __esm({
           await (0, import_promises5.readdir)(dir);
         } catch (err) {
           if (this._removeWatcher) {
-            this._removeWatcher(sp2.dirname(dir), sp2.basename(dir));
+            this._removeWatcher(sysPath2.dirname(dir), sysPath2.basename(dir));
           }
         }
       }
@@ -36002,19 +35993,12 @@ var init_chokidar = __esm({
     STAT_METHOD_F = "stat";
     STAT_METHOD_L = "lstat";
     WatchHelper = class {
-      fsw;
-      path;
-      watchPath;
-      fullWatchPath;
-      dirParts;
-      followSymlinks;
-      statMethod;
       constructor(path33, follow, fsw) {
         this.fsw = fsw;
         const watchPath = path33;
         this.path = path33 = path33.replace(REPLACER_RE, "");
         this.watchPath = watchPath;
-        this.fullWatchPath = sp2.resolve(watchPath);
+        this.fullWatchPath = sysPath2.resolve(watchPath);
         this.dirParts = [];
         this.dirParts.forEach((parts) => {
           if (parts.length > 1)
@@ -36024,7 +36008,7 @@ var init_chokidar = __esm({
         this.statMethod = follow ? STAT_METHOD_F : STAT_METHOD_L;
       }
       entryPath(entry) {
-        return sp2.join(this.watchPath, sp2.relative(this.watchPath, entry.fullPath));
+        return sysPath2.join(this.watchPath, sysPath2.relative(this.watchPath, entry.fullPath));
       }
       filterPath(entry) {
         const { stats } = entry;
@@ -36037,25 +36021,7 @@ var init_chokidar = __esm({
         return this.fsw._isntIgnored(this.entryPath(entry), entry.stats);
       }
     };
-    FSWatcher = class extends import_node_events.EventEmitter {
-      closed;
-      options;
-      _closers;
-      _ignoredPaths;
-      _throttled;
-      _streams;
-      _symlinkPaths;
-      _watched;
-      _pendingWrites;
-      _pendingUnlinks;
-      _readyCount;
-      _emitReady;
-      _closePromise;
-      _userIgnored;
-      _readyEmitted;
-      _emitRaw;
-      _boundRemove;
-      _nodeFsHandler;
+    FSWatcher = class extends import_events.EventEmitter {
       // Not indenting methods for history sake; for now.
       constructor(_opts = {}) {
         super();
@@ -36174,7 +36140,7 @@ var init_chokidar = __esm({
             return;
           results.forEach((item) => {
             if (item)
-              this.add(sp2.dirname(item), sp2.basename(_origAdd || item));
+              this.add(sysPath2.dirname(item), sysPath2.basename(_origAdd || item));
           });
         });
         return this;
@@ -36188,10 +36154,10 @@ var init_chokidar = __esm({
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
         paths.forEach((path33) => {
-          if (!sp2.isAbsolute(path33) && !this._closers.has(path33)) {
+          if (!sysPath2.isAbsolute(path33) && !this._closers.has(path33)) {
             if (cwd)
-              path33 = sp2.join(cwd, path33);
-            path33 = sp2.resolve(path33);
+              path33 = sysPath2.join(cwd, path33);
+            path33 = sysPath2.resolve(path33);
           }
           this._closePath(path33);
           this._addIgnoredPath(path33);
@@ -36240,7 +36206,7 @@ var init_chokidar = __esm({
       getWatched() {
         const watchList = {};
         this._watched.forEach((entry, dir) => {
-          const key = this.options.cwd ? sp2.relative(this.options.cwd, dir) : dir;
+          const key = this.options.cwd ? sysPath2.relative(this.options.cwd, dir) : dir;
           const index = key || ONE_DOT;
           watchList[index] = entry.getChildren().sort();
         });
@@ -36266,9 +36232,9 @@ var init_chokidar = __esm({
           return;
         const opts = this.options;
         if (isWindows)
-          path33 = sp2.normalize(path33);
+          path33 = sysPath2.normalize(path33);
         if (opts.cwd)
-          path33 = sp2.relative(opts.cwd, path33);
+          path33 = sysPath2.relative(opts.cwd, path33);
         const args = [path33];
         if (stats != null)
           args.push(stats);
@@ -36319,7 +36285,7 @@ var init_chokidar = __esm({
             return this;
         }
         if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-          const fullPath = opts.cwd ? sp2.join(opts.cwd, path33) : path33;
+          const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path33) : path33;
           let stats2;
           try {
             stats2 = await (0, import_promises5.stat)(fullPath);
@@ -36395,13 +36361,13 @@ var init_chokidar = __esm({
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
         let fullPath = path33;
-        if (this.options.cwd && !sp2.isAbsolute(path33)) {
-          fullPath = sp2.join(this.options.cwd, path33);
+        if (this.options.cwd && !sysPath2.isAbsolute(path33)) {
+          fullPath = sysPath2.join(this.options.cwd, path33);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
-          (0, import_node_fs3.stat)(fullPath, (err, curStat) => {
+          (0, import_fs8.stat)(fullPath, (err, curStat) => {
             if (err || !writes.has(path33)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
@@ -36466,7 +36432,7 @@ var init_chokidar = __esm({
        * @param directory path of the directory
        */
       _getWatchedDir(directory) {
-        const dir = sp2.resolve(directory);
+        const dir = sysPath2.resolve(directory);
         if (!this._watched.has(dir))
           this._watched.set(dir, new DirEntry(dir, this._boundRemove));
         return this._watched.get(dir);
@@ -36489,8 +36455,8 @@ var init_chokidar = __esm({
        * @param item      base path of item/directory
        */
       _remove(directory, item, isDirectory) {
-        const path33 = sp2.join(directory, item);
-        const fullPath = sp2.resolve(path33);
+        const path33 = sysPath2.join(directory, item);
+        const fullPath = sysPath2.resolve(path33);
         isDirectory = isDirectory != null ? isDirectory : this._watched.has(path33) || this._watched.has(fullPath);
         if (!this._throttle("remove", path33, 100))
           return;
@@ -36508,7 +36474,7 @@ var init_chokidar = __esm({
         }
         let relPath = path33;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path33);
+          relPath = sysPath2.relative(this.options.cwd, path33);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
@@ -36526,8 +36492,8 @@ var init_chokidar = __esm({
        */
       _closePath(path33) {
         this._closeFile(path33);
-        const dir = sp2.dirname(path33);
-        this._getWatchedDir(dir).remove(sp2.basename(path33));
+        const dir = sysPath2.dirname(path33);
+        this._getWatchedDir(dir).remove(sysPath2.basename(path33));
       }
       /**
        * Closes only file-specific watchers
@@ -36872,7 +36838,7 @@ var init_provider_loader = __esm({
     fs7 = __toESM(require("fs"));
     path17 = __toESM(require("path"));
     os16 = __toESM(require("os"));
-    init_chokidar();
+    init_esm2();
     init_ide_detector();
     init_logger();
     init_provider_schema();
@@ -39093,7 +39059,7 @@ function resolveAdhdevMcpServerLaunch(options) {
   if (!entryPath) return null;
   return {
     command: options.nodeExecutable?.trim() || process.execPath,
-    args: [entryPath, "--repo-mesh", options.meshId]
+    args: [entryPath, "--mode", "ipc", "--repo-mesh", options.meshId]
   };
 }
 function resolveAdhdevMcpEntryPath(explicitPath) {
@@ -39131,17 +39097,17 @@ function resolveAdhdevMcpEntryPath(explicitPath) {
 }
 function normalizeExistingPath(filePath) {
   try {
-    if (!(0, import_node_fs4.existsSync)(filePath)) return null;
-    return import_node_fs4.realpathSync.native(filePath);
+    if (!(0, import_node_fs2.existsSync)(filePath)) return null;
+    return import_node_fs2.realpathSync.native(filePath);
   } catch {
     return null;
   }
 }
-var import_node_fs4, import_node_module2, import_node_path2, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND;
+var import_node_fs2, import_node_module2, import_node_path2, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND;
 var init_mesh_coordinator = __esm({
   "../../oss/packages/daemon-core/src/commands/mesh-coordinator.ts"() {
     "use strict";
-    import_node_fs4 = require("fs");
+    import_node_fs2 = require("fs");
     import_node_module2 = require("module");
     import_node_path2 = require("path");
     DEFAULT_SERVER_NAME = "adhdev-mesh";
@@ -39911,7 +39877,7 @@ function summarizeSessionHostPruneResult(result) {
     keptCount: Array.isArray(value.keptSessionIds) ? value.keptSessionIds.length : void 0
   };
 }
-var fs10, CHANNEL_NPM_TAG, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
+var fs10, CHANNEL_NPM_TAG, CHANNEL_SERVER_URL, CHAT_COMMANDS, READ_DEBUG_ENABLED2, DaemonCommandRouter;
 var init_router = __esm({
   "../../oss/packages/daemon-core/src/commands/router.ts"() {
     "use strict";
@@ -39939,6 +39905,10 @@ var init_router = __esm({
     init_upgrade_helper();
     fs10 = __toESM(require("fs"));
     CHANNEL_NPM_TAG = { stable: "latest", preview: "next" };
+    CHANNEL_SERVER_URL = {
+      stable: "https://api.adhf.dev",
+      preview: "https://api-preview.adhf.dev"
+    };
     CHAT_COMMANDS = [
       "send_chat",
       "new_chat",
@@ -40544,6 +40514,7 @@ var init_router = __esm({
               const npmTag = CHANNEL_NPM_TAG[channel];
               const latest = String(execNpmCommandSync(["view", `${pkgName}@${npmTag}`, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
               LOG.info("Upgrade", `Latest ${pkgName}@${npmTag}: v${latest}`);
+              updateConfig({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL[channel] });
               let currentInstalled = null;
               try {
                 const currentJson = String(execNpmCommandSync(["ls", "-g", pkgName, "--depth=0", "--json"], {
@@ -40746,7 +40717,8 @@ var init_router = __esm({
               };
               if (args?.inlineMesh) {
                 mcpServerEntry.env = {
-                  ADHDEV_INLINE_MESH: JSON.stringify(mesh)
+                  ADHDEV_INLINE_MESH: JSON.stringify(mesh),
+                  ADHDEV_MCP_TRANSPORT: "ipc"
                 };
               }
               const mcpConfig = {
@@ -42526,7 +42498,7 @@ function runCommand(cmd, timeout = 1e4) {
   }
 }
 function findBinary2(name) {
-  const cmd = (0, import_os3.platform)() === "win32" ? `where ${name}` : `which ${name}`;
+  const cmd = (0, import_os4.platform)() === "win32" ? `where ${name}` : `which ${name}`;
   const result = runCommand(cmd, 5e3);
   return result ? result.split("\n")[0] : null;
 }
@@ -42574,7 +42546,7 @@ function checkPathExists2(paths) {
   return null;
 }
 function getMacAppVersion(appPath) {
-  if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
+  if ((0, import_os4.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
   const plistPath = path21.join(appPath, "Contents", "Info.plist");
   if (!fs11.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
@@ -42582,7 +42554,7 @@ function getMacAppVersion(appPath) {
 }
 async function detectAllVersions(loader, archive) {
   const results = [];
-  const currentOs = (0, import_os3.platform)();
+  const currentOs = (0, import_os4.platform)();
   for (const provider of loader.getAll()) {
     const info = {
       type: provider.type,
@@ -42638,7 +42610,7 @@ async function detectAllVersions(loader, archive) {
   }
   return results;
 }
-var fs11, path21, os21, import_child_process10, import_os3, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
+var fs11, path21, os21, import_child_process10, import_os4, ARCHIVE_PATH, MAX_ENTRIES_PER_PROVIDER, VersionArchive;
 var init_version_archive = __esm({
   "../../oss/packages/daemon-core/src/providers/version-archive.ts"() {
     "use strict";
@@ -42646,7 +42618,7 @@ var init_version_archive = __esm({
     path21 = __toESM(require("path"));
     os21 = __toESM(require("os"));
     import_child_process10 = require("child_process");
-    import_os3 = require("os");
+    import_os4 = require("os");
     ARCHIVE_PATH = path21.join(os21.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
     VersionArchive = class {
@@ -42672,7 +42644,7 @@ var init_version_archive = __esm({
         entries.push({
           version: version2,
           detectedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          os: (0, import_os3.platform)()
+          os: (0, import_os4.platform)()
         });
         if (entries.length > MAX_ENTRIES_PER_PROVIDER) {
           this.history[type] = entries.slice(-MAX_ENTRIES_PER_PROVIDER);
@@ -49341,13 +49313,14 @@ var init_server_connection = __esm({
             reject(new Error(`Mesh command timed out after ${timeoutMs}ms`));
           }, timeoutMs);
           const handler = (msg) => {
-            if (msg.payload?.requestId !== requestId) return;
+            const body = msg.payload && typeof msg.payload === "object" ? { ...msg, ...msg.payload } : msg;
+            if (body.requestId !== requestId) return;
             this.off("daemon_mesh_result", handler);
             clearTimeout(timer);
-            if (msg.payload?.success === false) {
-              reject(new Error(msg.payload?.error ?? "Mesh command failed"));
+            if (body.success === false) {
+              reject(new Error(body.error ?? "Mesh command failed"));
             } else {
-              resolve20(msg.payload?.result);
+              resolve20(body.result);
             }
           };
           this.on("daemon_mesh_result", handler);
@@ -49449,17 +49422,19 @@ var init_server_connection = __esm({
             return;
           } else if (message.type === "version_mismatch") {
             const p = message.payload;
+            const updateCommand = typeof p.updateCommand === "string" && p.updateCommand.trim() ? p.updateCommand.trim() : "adhdev daemon:upgrade";
             LOG.info("Server", `
   \u{1F504} Update available: v${p.current} \u2192 v${p.latest}`);
-            LOG.info("Server", `     Run: adhdev daemon:upgrade
+            LOG.info("Server", `     Run: ${updateCommand}
 `);
           } else if (message.type === "force_update_required") {
             this.compatBlocked = true;
             const p = message.payload;
+            const updateCommand = typeof p.updateCommand === "string" && p.updateCommand.trim() ? p.updateCommand.trim() : "adhdev daemon:upgrade";
             LOG.error("Server", `
   \u26D4 Daemon v${this.options.daemonVersion} is no longer compatible.`);
             LOG.error("Server", `     Minimum required: v${p.minVersion}`);
-            LOG.error("Server", `     Run: adhdev daemon:upgrade
+            LOG.error("Server", `     Run: ${updateCommand}
 `);
           }
           const handlers = this.messageHandlers.get(message.type);
@@ -55335,10 +55310,10 @@ var require_color = __commonJS({
       const b = srgbNonlinearTransformInv(rgb[2] / 255);
       const lp = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b);
       const mp = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b);
-      const sp3 = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b);
-      const l = 0.2104542553 * lp + 0.793617785 * mp - 0.0040720468 * sp3;
-      const aa = 1.9779984951 * lp - 2.428592205 * mp + 0.4505937099 * sp3;
-      const bb = 0.0259040371 * lp + 0.7827717662 * mp - 0.808675766 * sp3;
+      const sp = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b);
+      const l = 0.2104542553 * lp + 0.793617785 * mp - 0.0040720468 * sp;
+      const aa = 1.9779984951 * lp - 2.428592205 * mp + 0.4505937099 * sp;
+      const bb = 0.0259040371 * lp + 0.7827717662 * mp - 0.808675766 * sp;
       return [l * 100, aa * 100, bb * 100];
     };
     convert.rgb.cmyk = function(rgb) {
@@ -55600,10 +55575,10 @@ var require_color = __commonJS({
       const z2 = xyz[2] / 100;
       const lp = Math.cbrt(0.8189330101 * x + 0.3618667424 * y - 0.1288597137 * z2);
       const mp = Math.cbrt(0.0329845436 * x + 0.9293118715 * y + 0.0361456387 * z2);
-      const sp3 = Math.cbrt(0.0482003018 * x + 0.2643662691 * y + 0.633851707 * z2);
-      const l = 0.2104542553 * lp + 0.793617785 * mp - 0.0040720468 * sp3;
-      const a = 1.9779984951 * lp - 2.428592205 * mp + 0.4505937099 * sp3;
-      const b = 0.0259040371 * lp + 0.7827717662 * mp - 0.808675766 * sp3;
+      const sp = Math.cbrt(0.0482003018 * x + 0.2643662691 * y + 0.633851707 * z2);
+      const l = 0.2104542553 * lp + 0.793617785 * mp - 0.0040720468 * sp;
+      const a = 1.9779984951 * lp - 2.428592205 * mp + 0.4505937099 * sp;
+      const b = 0.0259040371 * lp + 0.7827717662 * mp - 0.808675766 * sp;
       return [l * 100, a * 100, b * 100];
     };
     convert.oklab.oklch = function(oklab) {
@@ -58525,7 +58500,7 @@ function _supportsColor2(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return min;
   }
   if (import_node_process2.default.platform === "win32") {
-    const osRelease = import_node_os3.default.release().split(".");
+    const osRelease = import_node_os2.default.release().split(".");
     if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
       return Number(osRelease[2]) >= 14931 ? 3 : 2;
     }
@@ -58584,12 +58559,12 @@ function createSupportsColor2(stream, options = {}) {
   });
   return translateLevel2(level);
 }
-var import_node_process2, import_node_os3, import_node_tty2, env2, flagForceColor2, supportsColor2, supports_color_default2;
+var import_node_process2, import_node_os2, import_node_tty2, env2, flagForceColor2, supportsColor2, supports_color_default2;
 var init_supports_color2 = __esm({
   "../../node_modules/chalk/source/vendor/supports-color/index.js"() {
     "use strict";
     import_node_process2 = __toESM(require("process"), 1);
-    import_node_os3 = __toESM(require("os"), 1);
+    import_node_os2 = __toESM(require("os"), 1);
     import_node_tty2 = __toESM(require("tty"), 1);
     ({ env: env2 } = import_node_process2.default);
     if (hasFlag2("no-color") || hasFlag2("no-colors") || hasFlag2("color=false") || hasFlag2("color=never")) {
@@ -58807,18 +58782,18 @@ function resolvePackageVersion(options) {
   ];
   for (const p of possiblePaths) {
     try {
-      const data = JSON.parse((0, import_fs7.readFileSync)(p, "utf-8"));
+      const data = JSON.parse((0, import_fs9.readFileSync)(p, "utf-8"));
       if (data.version) return data.version;
     } catch {
     }
   }
   return injectedVersion;
 }
-var import_fs7, import_path4;
+var import_fs9, import_path4;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    import_fs7 = require("fs");
+    import_fs9 = require("fs");
     import_path4 = require("path");
   }
 });
@@ -58857,7 +58832,9 @@ var init_daemon_mesh_manager = __esm({
         "read_chat",
         "git_status",
         "git_diff_summary",
-        "launch_cli"
+        "launch_cli",
+        "git_checkpoint",
+        "resolve_action"
       ]);
       setRules(rules) {
         const valid = [];
@@ -59148,7 +59125,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.75" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.10" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -59984,6 +59961,19 @@ ${err?.stack || ""}`);
         void this.statusReporter?.sendUnifiedStatusReport({ forceServer: true, reason });
         void this.flushP2PDaemonMetadataSubscriptions();
       }
+      emitMeshCheckpointCompleteIfNeeded(commandType, result, normalizedData) {
+        if (commandType !== "git_checkpoint" || result?.success !== true || !this.meshManager) return;
+        const workspace = String(normalizedData.workspace ?? "");
+        const baseContext = {
+          workspace,
+          checkpoint_message: result.checkpoint?.message ?? String(normalizedData.message ?? ""),
+          commit: result.checkpoint?.commit ?? "",
+          source_session_id: String(normalizedData.targetSessionId ?? "")
+        };
+        void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
+          this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
+        });
+      }
       async handleCommand(msg, cmd, args) {
         const normalizedArgs = this.ensureInteractionContext(args);
         const interactionId = String(normalizedArgs._interactionId);
@@ -60018,6 +60008,10 @@ ${err?.stack || ""}`);
           if (cmd === "resolve_action" || cmd === "send_chat" || cmd === "read_chat") {
             void this.flushP2PSessionModalSubscriptions();
           }
+          if (cmd.startsWith("git_")) {
+            void this.flushP2PWorkspaceGitSubscriptions();
+          }
+          this.emitMeshCheckpointCompleteIfNeeded(cmd, result, normalizedArgs);
           this.sendResult(msg, result.success, { ...result, interactionId });
           recordDebugTrace({
             interactionId,
@@ -60099,18 +60093,7 @@ ${err?.stack || ""}`);
           if (cmdType.startsWith("git_")) {
             void this.flushP2PWorkspaceGitSubscriptions();
           }
-          if (cmdType === "git_checkpoint" && routed.success && this.meshManager) {
-            const workspace = String(normalizedData.workspace ?? "");
-            const baseContext = {
-              workspace,
-              checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
-              commit: routed.checkpoint?.commit ?? "",
-              source_session_id: String(normalizedData.targetSessionId ?? "")
-            };
-            void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
-              this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
-            });
-          }
+          this.emitMeshCheckpointCompleteIfNeeded(cmdType, routed, normalizedData);
           return { ...routed, interactionId };
         } catch (e) {
           logCommand({ ts: (/* @__PURE__ */ new Date()).toISOString(), cmd: cmdType, source: "p2p", interactionId, success: false, error: e.message, durationMs: Date.now() - cmdStart });
@@ -60250,7 +60233,21 @@ ${err?.stack || ""}`);
           return;
         }
         try {
-          const result = await this.components.router.execute(command, normalizedArgs, "ipc");
+          let result;
+          if (command === "mesh_relay_command") {
+            if (!this.meshManager) throw new Error("Mesh manager is not initialized");
+            const targetDaemonId = typeof normalizedArgs.targetDaemonId === "string" ? normalizedArgs.targetDaemonId : "";
+            const relayedCommand = typeof normalizedArgs.command === "string" ? normalizedArgs.command : "";
+            const relayedArgs = normalizedArgs.args && typeof normalizedArgs.args === "object" ? normalizedArgs.args : {};
+            if (!targetDaemonId || !relayedCommand) {
+              throw new Error("mesh_relay_command requires targetDaemonId and command");
+            }
+            const relayResult = await this.meshManager.sendCommand(targetDaemonId, relayedCommand, relayedArgs);
+            result = { success: true, result: relayResult };
+          } else {
+            result = await this.components.router.execute(command, normalizedArgs, "ipc");
+            this.emitMeshCheckpointCompleteIfNeeded(command, result, normalizedArgs);
+          }
           ws.send(JSON.stringify({
             type: "ext:command_result",
             payload: {
@@ -60581,7 +60578,7 @@ function isUnicodeSupported() {
   import_node_process3.default.env["TERM_PROGRAM"] === "Terminus-Sublime" || import_node_process3.default.env["TERM_PROGRAM"] === "vscode" || import_node_process3.default.env["TERM"] === "xterm-256color" || import_node_process3.default.env["TERM"] === "alacritty" || import_node_process3.default.env["TERMINAL_EMULATOR"] === "JetBrains-JediTerm";
 }
 var import_node_process3, common, specialMainSymbols, specialFallbackSymbols, mainSymbols, fallbackSymbols, shouldUseMain, figures, esm_default, replacements;
-var init_esm = __esm({
+var init_esm3 = __esm({
   "../../node_modules/@inquirer/figures/dist/esm/index.js"() {
     "use strict";
     import_node_process3 = __toESM(require("process"), 1);
@@ -70502,7 +70499,7 @@ var init_separator = __esm({
   "../../node_modules/inquirer/lib/objects/separator.js"() {
     "use strict";
     import_yoctocolors_cjs2 = __toESM(require_yoctocolors_cjs(), 1);
-    init_esm();
+    init_esm3();
     Separator = class {
       constructor(line) {
         this.type = "separator";
@@ -78626,7 +78623,7 @@ var init_list = __esm({
     "use strict";
     import_ansi_escapes3 = __toESM(require_ansi_escapes(), 1);
     import_yoctocolors_cjs4 = __toESM(require_yoctocolors_cjs(), 1);
-    init_esm();
+    init_esm3();
     import_run_async2 = __toESM(require_run_async(), 1);
     import_rxjs3 = __toESM(require_cjs(), 1);
     init_events();
@@ -79321,7 +79318,7 @@ var init_checkbox = __esm({
     "use strict";
     import_ansi_escapes4 = __toESM(require_ansi_escapes(), 1);
     import_yoctocolors_cjs9 = __toESM(require_yoctocolors_cjs(), 1);
-    init_esm();
+    init_esm3();
     import_rxjs8 = __toESM(require_cjs(), 1);
     init_events();
     init_paginator();
@@ -89075,15 +89072,15 @@ function splitStringBySpace(str) {
   }
   return pieces;
 }
-var import_chardet, import_child_process14, import_fs8, import_node_path3, import_node_os4, import_node_crypto2, import_iconv_lite, ExternalEditor;
-var init_esm2 = __esm({
+var import_chardet, import_child_process14, import_fs10, import_node_path3, import_node_os3, import_node_crypto2, import_iconv_lite, ExternalEditor;
+var init_esm4 = __esm({
   "../../node_modules/@inquirer/external-editor/dist/esm/index.js"() {
     "use strict";
     import_chardet = __toESM(require_lib2(), 1);
     import_child_process14 = require("child_process");
-    import_fs8 = require("fs");
+    import_fs10 = require("fs");
     import_node_path3 = __toESM(require("path"), 1);
-    import_node_os4 = __toESM(require("os"), 1);
+    import_node_os3 = __toESM(require("os"), 1);
     import_node_crypto2 = require("crypto");
     import_iconv_lite = __toESM(require_lib3(), 1);
     init_CreateFileError();
@@ -89142,7 +89139,7 @@ var init_esm2 = __esm({
       }
       createTemporaryFile() {
         try {
-          const baseDir = this.fileOptions.dir ?? import_node_os4.default.tmpdir();
+          const baseDir = this.fileOptions.dir ?? import_node_os3.default.tmpdir();
           const id = (0, import_node_crypto2.randomUUID)();
           const prefix = sanitizeAffix(this.fileOptions.prefix);
           const postfix = sanitizeAffix(this.fileOptions.postfix);
@@ -89157,14 +89154,14 @@ var init_esm2 = __esm({
           if (Object.prototype.hasOwnProperty.call(this.fileOptions, "mode")) {
             opt.mode = this.fileOptions.mode;
           }
-          (0, import_fs8.writeFileSync)(this.tempFile, this.text, opt);
+          (0, import_fs10.writeFileSync)(this.tempFile, this.text, opt);
         } catch (createFileError) {
           throw new CreateFileError(createFileError);
         }
       }
       readTemporaryFile() {
         try {
-          const tempFileBuffer = (0, import_fs8.readFileSync)(this.tempFile);
+          const tempFileBuffer = (0, import_fs10.readFileSync)(this.tempFile);
           if (tempFileBuffer.length === 0) {
             this.text = "";
           } else {
@@ -89180,7 +89177,7 @@ var init_esm2 = __esm({
       }
       removeTemporaryFile() {
         try {
-          (0, import_fs8.unlinkSync)(this.tempFile);
+          (0, import_fs10.unlinkSync)(this.tempFile);
         } catch (removeFileError) {
           throw new RemoveFileError(removeFileError);
         }
@@ -89214,7 +89211,7 @@ var init_editor = __esm({
   "../../node_modules/inquirer/lib/prompts/editor.js"() {
     "use strict";
     import_yoctocolors_cjs11 = __toESM(require_yoctocolors_cjs(), 1);
-    init_esm2();
+    init_esm4();
     import_rxjs10 = __toESM(require_cjs(), 1);
     init_events();
     init_base();
@@ -90899,7 +90896,58 @@ init_lib();
 init_ora();
 init_src();
 init_version();
-var SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
+var CHANNEL_NPM_TAG2 = {
+  stable: "latest",
+  preview: "next"
+};
+var CHANNEL_SERVER_URL2 = {
+  stable: "https://api.adhf.dev",
+  preview: "https://api-preview.adhf.dev"
+};
+function normalizeSetupReleaseChannel(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "stable" || normalized === "latest") return "stable";
+  if (normalized === "preview" || normalized === "next") return "preview";
+  return null;
+}
+function inferReleaseChannelFromServerUrl(serverUrl) {
+  if (typeof serverUrl !== "string") return null;
+  const normalized = serverUrl.trim().toLowerCase();
+  if (!normalized) return null;
+  if (normalized.includes("api-preview.adhf.dev") || normalized.includes("dev.adhf.dev")) return "preview";
+  if (normalized.includes("api.adhf.dev") || normalized.includes("adhf.dev")) return "stable";
+  return null;
+}
+function buildDashboardUrl(serverUrl, channel) {
+  try {
+    const url2 = new URL(serverUrl);
+    if (url2.hostname === "api-preview.adhf.dev") return "https://dev.adhf.dev/dashboard";
+    if (url2.hostname === "api.adhf.dev") return "https://adhf.dev/dashboard";
+    if (url2.hostname === "127.0.0.1" || url2.hostname === "localhost") {
+      url2.port = url2.port === "3100" ? "3000" : url2.port;
+      url2.pathname = "/dashboard";
+      url2.search = "";
+      url2.hash = "";
+      return url2.toString();
+    }
+  } catch {
+  }
+  return channel === "preview" ? "https://dev.adhf.dev/dashboard" : "https://adhf.dev/dashboard";
+}
+function buildSetupReleaseContext(options = {}) {
+  const env3 = options.env || process.env;
+  const envServerUrl = typeof env3.ADHDEV_SERVER_URL === "string" && env3.ADHDEV_SERVER_URL.trim() ? env3.ADHDEV_SERVER_URL.trim() : null;
+  const config2 = options.config || {};
+  const channel = normalizeSetupReleaseChannel(config2.updateChannel) || inferReleaseChannelFromServerUrl(envServerUrl) || inferReleaseChannelFromServerUrl(config2.serverUrl) || "stable";
+  const serverUrl = envServerUrl || CHANNEL_SERVER_URL2[channel];
+  return {
+    channel,
+    npmTag: CHANNEL_NPM_TAG2[channel],
+    serverUrl,
+    dashboardUrl: buildDashboardUrl(serverUrl, channel)
+  };
+}
 var LOGO = `
 ${source_default2.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
 ${source_default2.cyan("\u2551")}  ${source_default2.bold.white("\u{1F9A6} ADHDev Setup Wizard")}               ${source_default2.cyan("\u2551")}
@@ -90915,10 +90963,10 @@ function hasCloudMachineAuth() {
   const config2 = loadConfig();
   return Boolean(config2.machineSecret && config2.machineSecret.trim());
 }
-function readLatestPublishedCliVersion(execFileSyncLocal) {
+function readLatestPublishedCliVersion(execFileSyncLocal, npmTag = "latest") {
   const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
   try {
-    return execFileSyncLocal(surface.npmExecutable, [...surface.npmArgsPrefix || [], "view", "adhdev", "version"], {
+    return execFileSyncLocal(surface.npmExecutable, [...surface.npmArgsPrefix || [], "view", `adhdev@${npmTag}`, "version"], {
       encoding: "utf-8",
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"],
@@ -90949,38 +90997,41 @@ function readInstalledGlobalCliVersion(execFileSyncLocal) {
 }
 async function runWizard(options = {}) {
   console.log(LOGO);
+  const config2 = loadConfig();
+  const releaseContext = buildSetupReleaseContext({ config: config2 });
   if (isSetupComplete() && hasCloudMachineAuth() && !options.force) {
-    const config2 = loadConfig();
     console.log(source_default2.green("\u2713") + " ADHDev is already configured.");
     console.log(source_default2.gray(`  Account: ${config2.userEmail || "not logged in"}`));
+    console.log(source_default2.gray(`  Server:  ${releaseContext.serverUrl}`));
     console.log();
-    await checkForUpdate();
-    await startDaemonFlow();
+    await checkForUpdate(releaseContext);
+    await startDaemonFlow(releaseContext);
     return;
   }
-  await quickSetup();
+  await quickSetup(releaseContext);
 }
-async function checkForUpdate() {
+async function checkForUpdate(releaseContext) {
   try {
     const { execFileSync: execFileSync5 } = await import("child_process");
     const currentVersion = resolvePackageVersion();
-    const latestVersion = readLatestPublishedCliVersion(execFileSync5);
+    const latestVersion = readLatestPublishedCliVersion(execFileSync5, releaseContext.npmTag);
     if (!latestVersion) return;
     if (!currentVersion || !latestVersion || currentVersion === latestVersion) return;
-    console.log(source_default2.yellow(`  Update available: ${currentVersion} \u2192 ${latestVersion}`));
+    console.log(source_default2.yellow(`  Update available (${releaseContext.channel}/${releaseContext.npmTag}): ${currentVersion} \u2192 ${latestVersion}`));
     const { doUpdate } = await (await Promise.resolve().then(() => (init_lib(), lib_exports))).default.prompt([{
       type: "confirm",
       name: "doUpdate",
-      message: `Update adhdev CLI to v${latestVersion}?`,
+      message: `Update adhdev CLI to v${latestVersion} from ${releaseContext.npmTag}?`,
       default: true
     }]);
     if (!doUpdate) {
-      console.log(source_default2.gray("  Skipping update. Run: npm install -g adhdev@latest\n"));
+      console.log(source_default2.gray(`  Skipping update. Run: npm install -g adhdev@${releaseContext.npmTag}
+`));
       return;
     }
     const spinner = (await Promise.resolve().then(() => (init_ora(), ora_exports))).default("Updating adhdev CLI...").start();
     try {
-      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: releaseContext.npmTag });
       execFileSync5(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
@@ -90991,14 +91042,17 @@ async function checkForUpdate() {
       console.log();
     } catch (e) {
       spinner.fail("Update failed");
-      console.log(source_default2.gray("  Manual: npm install -g adhdev@latest\n"));
+      console.log(source_default2.gray(`  Manual: npm install -g adhdev@${releaseContext.npmTag}
+`));
     }
   } catch {
   }
 }
-async function quickSetup() {
+async function quickSetup(releaseContext) {
   console.log(source_default2.bold("\n\u{1F680} Quick Setup\n"));
-  const loginResult = await loginFlow();
+  console.log(source_default2.gray(`  Channel: ${releaseContext.channel} (${releaseContext.npmTag})`));
+  console.log(source_default2.gray(`  Server:  ${releaseContext.serverUrl}`));
+  const loginResult = await loginFlow(releaseContext);
   const setupDate = (/* @__PURE__ */ new Date()).toISOString();
   if (!loginResult) {
     updateConfig({
@@ -91009,7 +91063,9 @@ async function quickSetup() {
       setupDate,
       userEmail: null,
       userName: null,
-      machineSecret: null
+      machineSecret: null,
+      updateChannel: releaseContext.channel,
+      serverUrl: releaseContext.serverUrl
     });
     console.log(source_default2.yellow("\u26A0 Setup is not complete without login. Run `adhdev setup` after signing in."));
   }
@@ -91020,14 +91076,16 @@ async function quickSetup() {
       userEmail: loginResult.email,
       userName: loginResult.name,
       setupDate,
+      updateChannel: releaseContext.channel,
+      serverUrl: releaseContext.serverUrl,
       ...loginResult.registeredMachineId ? { registeredMachineId: loginResult.registeredMachineId } : {}
     };
     updateConfig(configUpdate);
     console.log(source_default2.green(`  \u2713 Machine registered`));
   }
-  await installCliOnly();
+  await installCliOnly(releaseContext);
   if (loginResult) {
-    await startDaemonFlow();
+    await startDaemonFlow(releaseContext);
   } else {
     console.log(source_default2.gray("  Start daemon after login: adhdev setup"));
     console.log();
@@ -91036,6 +91094,7 @@ async function quickSetup() {
   console.log(source_default2.bold("\n\u{1F389} Setup Complete!\n"));
   console.log(`  ${source_default2.bold("User:")}    ${loginResult?.email || "not logged in"}`);
   console.log(`  ${source_default2.bold("Status:")}  ${loginResult ? source_default2.green("Ready to connect") : source_default2.yellow("Login required")}`);
+  console.log(`  ${source_default2.bold("Server:")}  ${releaseContext.serverUrl}`);
   console.log();
   console.log(source_default2.gray("  Next steps:"));
   console.log(source_default2.gray(`    ${loginResult ? "adhdev daemon              \u2014 Start the main daemon (IDE / remote features)" : "adhdev setup               \u2014 Sign in to finish setup and enable the daemon"}`));
@@ -91046,11 +91105,12 @@ async function quickSetup() {
   console.log(source_default2.gray("    adhdev launch claude       \u2014 Start Claude Code agent"));
   console.log(source_default2.gray("    adhdev status              \u2014 Check setup status"));
   console.log();
-  console.log(source_default2.cyan("  Dashboard: https://adhf.dev/dashboard"));
+  console.log(source_default2.cyan(`  Dashboard: ${releaseContext.dashboardUrl}`));
   console.log();
 }
-async function loginFlow() {
+async function loginFlow(releaseContext) {
   console.log(source_default2.bold("\n\u{1F510} Login to ADHDev\n"));
+  console.log(source_default2.gray(`  Auth server: ${releaseContext.serverUrl}`));
   const { wantLogin } = await lib_default.prompt([
     {
       type: "confirm",
@@ -91067,7 +91127,7 @@ async function loginFlow() {
   try {
     const config2 = loadConfig();
     const os29 = await import("os");
-    const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
+    const res = await fetch(`${releaseContext.serverUrl}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -91109,7 +91169,7 @@ async function loginFlow() {
   while (Date.now() - startTime < timeout) {
     await new Promise((r) => setTimeout(r, 3e3));
     try {
-      const res = await fetch(`${SERVER_URL}/auth/cli/poll`, {
+      const res = await fetch(`${releaseContext.serverUrl}/auth/cli/poll`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ deviceCode })
@@ -91139,9 +91199,9 @@ async function loginFlow() {
         console.log();
         console.log(source_default2.yellow("  To fix this, do one of the following:"));
         console.log(source_default2.gray("    1. Remove an unused machine from the dashboard:"));
-        console.log(source_default2.gray("       https://adhf.dev/account \u2192 Registered Machines \u2192 \u2715 Remove"));
+        console.log(source_default2.gray(`       ${releaseContext.dashboardUrl.replace(/\/dashboard$/, "/account")} \u2192 Registered Machines \u2192 \u2715 Remove`));
         console.log(source_default2.gray("    2. Upgrade your plan:"));
-        console.log(source_default2.gray("       https://adhf.dev/account?tab=billing"));
+        console.log(source_default2.gray(`       ${releaseContext.dashboardUrl.replace(/\/dashboard$/, "/account?tab=billing")}`));
         console.log();
         console.log(source_default2.gray("  Then run `adhdev setup` again."));
         console.log();
@@ -91153,11 +91213,12 @@ async function loginFlow() {
   pollSpinner.fail("Authentication timed out");
   return null;
 }
-async function startDaemonFlow() {
+async function startDaemonFlow(releaseContext) {
   const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
   if (isDaemonRunning2()) {
     console.log(source_default2.green("  \u2713 Daemon is already running"));
-    console.log(source_default2.gray("  Dashboard: https://adhf.dev/dashboard\n"));
+    console.log(source_default2.gray(`  Dashboard: ${releaseContext.dashboardUrl}
+`));
     return;
   }
   const { startDaemon } = await lib_default.prompt([
@@ -91211,7 +91272,7 @@ async function startDaemonFlow() {
     } else {
       daemonSpinner.warn("Daemon starting in background (may take a few seconds)");
     }
-    console.log(source_default2.gray("  Dashboard: https://adhf.dev/dashboard"));
+    console.log(source_default2.gray(`  Dashboard: ${releaseContext.dashboardUrl}`));
     console.log(source_default2.gray(`  Logs:      ${logPath}`));
     console.log();
   } catch (e) {
@@ -91219,7 +91280,7 @@ async function startDaemonFlow() {
     console.log(source_default2.gray("  Manual: adhdev daemon\n"));
   }
 }
-async function installCliOnly() {
+async function installCliOnly(releaseContext) {
   const { execFileSync: execFileSyncLocal } = await import("child_process");
   const currentVersion = readInstalledGlobalCliVersion(execFileSyncLocal);
   const isNpx = process.env.npm_execpath?.includes("npx") || process.argv[1]?.includes("npx") || process.argv[1]?.includes("_npx");
@@ -91232,7 +91293,7 @@ async function installCliOnly() {
   console.log();
   if (currentVersion) {
     console.log(source_default2.green(`  \u2713 Currently installed: v${currentVersion}`));
-    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal);
+    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal, releaseContext.npmTag);
     if (latestVersion && currentVersion === latestVersion) {
       console.log(source_default2.gray("  (Already up to date)"));
       return;
@@ -91241,12 +91302,12 @@ async function installCliOnly() {
       const { doUpdate } = await lib_default.prompt([{
         type: "confirm",
         name: "doUpdate",
-        message: `Update to latest version${latestVersion ? ` (v${latestVersion})` : ""}?`,
+        message: `Update to ${releaseContext.npmTag} version${latestVersion ? ` (v${latestVersion})` : ""}?`,
         default: true
       }]);
       if (!doUpdate) return;
     } else {
-      console.log(source_default2.gray("  Updating to latest..."));
+      console.log(source_default2.gray(`  Updating to ${releaseContext.npmTag}...`));
     }
   } else {
     console.log(source_default2.yellow("  \u2717 Not installed globally"));
@@ -91254,7 +91315,7 @@ async function installCliOnly() {
       const { doInstall } = await lib_default.prompt([{
         type: "confirm",
         name: "doInstall",
-        message: "Install adhdev CLI globally? (npm install -g adhdev)",
+        message: `Install adhdev CLI globally? (npm install -g adhdev@${releaseContext.npmTag})`,
         default: true
       }]);
       if (!doInstall) {
@@ -91267,14 +91328,14 @@ async function installCliOnly() {
   }
   const installSpinner = ora2("Installing adhdev CLI...").start();
   try {
-    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: releaseContext.npmTag });
     execFileSyncLocal(installCommand.command, installCommand.args, {
       encoding: "utf-8",
       timeout: 6e4,
       stdio: ["pipe", "pipe", "pipe"],
       ...installCommand.execOptions
     });
-    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || "latest";
+    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || releaseContext.npmTag;
     installSpinner.succeed(`adhdev CLI ${currentVersion ? "updated" : "installed"} \u2713 (v${newVersion})`);
     console.log(source_default2.gray("  Try: adhdev daemon"));
     console.log();
@@ -91285,7 +91346,7 @@ async function installCliOnly() {
     if (osModule.platform() === "win32") {
       console.log(source_default2.gray("  On Windows, run PowerShell as Administrator"));
     }
-    console.log(source_default2.gray("  Manual: npm install -g adhdev@latest"));
+    console.log(source_default2.gray(`  Manual: npm install -g adhdev@${releaseContext.npmTag}`));
     console.log();
   }
 }
@@ -91300,7 +91361,7 @@ async function installCliOnly() {
 });
 /*! Bundled license information:
 
-chokidar/index.js:
+chokidar/esm/index.js:
   (*! chokidar - MIT License (c) 2012 Paul Miller (paulmillr.com) *)
 
 sharp/lib/is.js: