adhdev 0.9.76-rc.1 → 0.9.76-rc.11

package/dist/index.js

@@ -1443,6 +1443,134 @@ var init_turn_snapshot_tracker = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/git/git-worktree.ts
+var git_worktree_exports = {};
+__export(git_worktree_exports, {
+  createWorktree: () => createWorktree,
+  listWorktrees: () => listWorktrees,
+  parseWorktreeListOutput: () => parseWorktreeListOutput,
+  removeWorktree: () => removeWorktree,
+  resolveWorktreePath: () => resolveWorktreePath
+});
+function resolveWorktreePath(repoRoot, meshName, branch) {
+  const safeBranch = branch.replace(/[/\\:*?"<>|]/g, "-").replace(/^\.+|\.+$/g, "");
+  const safeMeshName = meshName.replace(/[/\\:*?"<>|]/g, "-").replace(/^\.+|\.+$/g, "");
+  const parentDir = path4.dirname(repoRoot);
+  return path4.join(parentDir, WORKTREE_DIR_NAME, safeMeshName, safeBranch);
+}
+async function createWorktree(opts) {
+  const { repoRoot, branch, baseBranch, meshName } = opts;
+  const targetDir = opts.targetDir || resolveWorktreePath(repoRoot, meshName, branch);
+  if ((0, import_node_fs2.existsSync)(targetDir)) {
+    throw new Error(`Worktree target directory already exists: ${targetDir}`);
+  }
+  await (0, import_promises3.mkdir)(path4.dirname(targetDir), { recursive: true });
+  const args = ["worktree", "add", targetDir, "-b", branch];
+  if (baseBranch) {
+    args.push(baseBranch);
+  }
+  try {
+    await execFileAsync2("git", args, {
+      cwd: repoRoot,
+      encoding: "utf8",
+      timeout: GIT_TIMEOUT_MS,
+      maxBuffer: GIT_MAX_BUFFER,
+      windowsHide: true
+    });
+  } catch (error48) {
+    const stderr = typeof error48.stderr === "string" ? error48.stderr : "";
+    if (/already exists/i.test(stderr)) {
+      throw new Error(`Branch '${branch}' already exists or is checked out in another worktree`);
+    }
+    throw new Error(`git worktree add failed: ${stderr.trim() || error48.message}`);
+  }
+  return {
+    success: true,
+    worktreePath: targetDir,
+    branch
+  };
+}
+async function removeWorktree(repoRoot, worktreePath) {
+  if (!(0, import_node_fs2.existsSync)(worktreePath)) {
+    await pruneWorktrees(repoRoot);
+    return { success: true, removedPath: worktreePath };
+  }
+  try {
+    await execFileAsync2("git", ["worktree", "remove", worktreePath, "--force"], {
+      cwd: repoRoot,
+      encoding: "utf8",
+      timeout: GIT_TIMEOUT_MS,
+      maxBuffer: GIT_MAX_BUFFER,
+      windowsHide: true
+    });
+  } catch (error48) {
+    const stderr = typeof error48.stderr === "string" ? error48.stderr : "";
+    throw new Error(`git worktree remove failed: ${stderr.trim() || error48.message}`);
+  }
+  return { success: true, removedPath: worktreePath };
+}
+async function listWorktrees(repoRoot) {
+  const { stdout } = await execFileAsync2("git", ["worktree", "list", "--porcelain"], {
+    cwd: repoRoot,
+    encoding: "utf8",
+    timeout: GIT_TIMEOUT_MS,
+    maxBuffer: GIT_MAX_BUFFER,
+    windowsHide: true
+  });
+  return parseWorktreeListOutput(stdout);
+}
+function parseWorktreeListOutput(output) {
+  const entries = [];
+  const blocks = output.trim().split(/\n\n+/);
+  for (const block of blocks) {
+    if (!block.trim()) continue;
+    const lines = block.trim().split("\n");
+    const entry = { path: "", head: "", branch: null, bare: false };
+    for (const line of lines) {
+      if (line.startsWith("worktree ")) {
+        entry.path = line.slice("worktree ".length).trim();
+      } else if (line.startsWith("HEAD ")) {
+        entry.head = line.slice("HEAD ".length).trim();
+      } else if (line.startsWith("branch ")) {
+        const ref = line.slice("branch ".length).trim();
+        entry.branch = ref.replace(/^refs\/heads\//, "");
+      } else if (line === "bare") {
+        entry.bare = true;
+      }
+    }
+    if (entry.path) {
+      entries.push(entry);
+    }
+  }
+  return entries;
+}
+async function pruneWorktrees(repoRoot) {
+  try {
+    await execFileAsync2("git", ["worktree", "prune"], {
+      cwd: repoRoot,
+      encoding: "utf8",
+      timeout: GIT_TIMEOUT_MS,
+      windowsHide: true
+    });
+  } catch {
+  }
+}
+var path4, import_promises3, import_node_fs2, import_node_child_process2, import_node_util2, execFileAsync2, WORKTREE_DIR_NAME, GIT_TIMEOUT_MS, GIT_MAX_BUFFER;
+var init_git_worktree = __esm({
+  "../../oss/packages/daemon-core/src/git/git-worktree.ts"() {
+    "use strict";
+    path4 = __toESM(require("path"));
+    import_promises3 = require("fs/promises");
+    import_node_fs2 = require("fs");
+    import_node_child_process2 = require("child_process");
+    import_node_util2 = require("util");
+    execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
+    WORKTREE_DIR_NAME = ".adhdev-worktrees";
+    GIT_TIMEOUT_MS = 3e4;
+    GIT_MAX_BUFFER = 4 * 1024 * 1024;
+  }
+});
+
 // ../../oss/packages/daemon-core/src/git/index.ts
 var init_git = __esm({
   "../../oss/packages/daemon-core/src/git/index.ts"() {
@@ -1455,6 +1583,7 @@ var init_git = __esm({
     init_git_monitor();
     init_git_commands();
     init_turn_snapshot_tracker();
+    init_git_worktree();
   }
 });
 
@@ -1702,8 +1831,8 @@ var init_config = __esm({
 function expandPath(p) {
   const t = (p || "").trim();
   if (!t) return "";
-  if (t.startsWith("~")) return path4.join(os.homedir(), t.slice(1).replace(/^\//, ""));
-  return path4.resolve(t);
+  if (t.startsWith("~")) return path5.join(os.homedir(), t.slice(1).replace(/^\//, ""));
+  return path5.resolve(t);
 }
 function validateWorkspacePath(absPath) {
   try {
@@ -1717,7 +1846,7 @@ function validateWorkspacePath(absPath) {
   }
 }
 function defaultWorkspaceLabel(absPath) {
-  const base = path4.basename(absPath) || absPath;
+  const base = path5.basename(absPath) || absPath;
   return base;
 }
 function getDefaultWorkspacePath(config2) {
@@ -1808,9 +1937,9 @@ function resolveIdeLaunchWorkspace(args, config2) {
   return getDefaultWorkspacePath(config2) || void 0;
 }
 function findWorkspaceByPath(config2, rawPath) {
-  const abs = path4.resolve(expandPath(rawPath));
+  const abs = path5.resolve(expandPath(rawPath));
   if (!abs) return void 0;
-  return (config2.workspaces || []).find((w) => path4.resolve(expandPath(w.path)) === abs);
+  return (config2.workspaces || []).find((w) => path5.resolve(expandPath(w.path)) === abs);
 }
 function addWorkspaceEntry(config2, rawPath, label, options) {
   const abs = expandPath(rawPath);
@@ -1826,7 +1955,7 @@ function addWorkspaceEntry(config2, rawPath, label, options) {
   const v = validateWorkspacePath(abs);
   if (!v.ok) return { error: v.error };
   const list = [...config2.workspaces || []];
-  if (list.some((w) => path4.resolve(w.path) === abs)) {
+  if (list.some((w) => path5.resolve(w.path) === abs)) {
     return { error: "Workspace already in list" };
   }
   if (list.length >= MAX_WORKSPACES) {
@@ -1858,13 +1987,13 @@ function setDefaultWorkspaceId(config2, id) {
   if (validateWorkspacePath(abs).ok !== true) return { error: "Workspace path is no longer valid" };
   return { config: { ...config2, defaultWorkspaceId: id } };
 }
-var fs, os, path4, import_crypto2, MAX_WORKSPACES;
+var fs, os, path5, import_crypto2, MAX_WORKSPACES;
 var init_workspaces = __esm({
   "../../oss/packages/daemon-core/src/config/workspaces.ts"() {
     "use strict";
     fs = __toESM(require("fs"));
     os = __toESM(require("os"));
-    path4 = __toESM(require("path"));
+    path5 = __toESM(require("path"));
     import_crypto2 = require("crypto");
     MAX_WORKSPACES = 50;
   }
@@ -1941,9 +2070,9 @@ var init_summary_metadata = __esm({
 function normalizeWorkspace(workspace) {
   if (!workspace) return "";
   try {
-    return path5.resolve(expandPath(workspace));
+    return path6.resolve(expandPath(workspace));
   } catch {
-    return path5.resolve(workspace);
+    return path6.resolve(workspace);
   }
 }
 function buildRecentActivityKey(entry) {
@@ -2109,11 +2238,11 @@ function markSessionSeen(state, sessionId, seenAt = Date.now(), completionMarker
     sessionNotificationUnreadOverrides: nextSessionNotificationUnreadOverrides
   };
 }
-var path5, MAX_ACTIVITY;
+var path6, MAX_ACTIVITY;
 var init_recent_activity = __esm({
   "../../oss/packages/daemon-core/src/config/recent-activity.ts"() {
     "use strict";
-    path5 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     init_workspaces();
     init_summary_metadata();
     MAX_ACTIVITY = 30;
@@ -2124,9 +2253,9 @@ var init_recent_activity = __esm({
 function normalizeWorkspace2(workspace) {
   if (!workspace) return "";
   try {
-    return path6.resolve(expandPath(workspace));
+    return path7.resolve(expandPath(workspace));
   } catch {
-    return path6.resolve(workspace);
+    return path7.resolve(workspace);
   }
 }
 function buildSavedProviderSessionKey(providerSessionId) {
@@ -2169,11 +2298,11 @@ function getSavedProviderSessions(state, filters) {
     })
   })).sort((a, b) => b.lastUsedAt - a.lastUsedAt);
 }
-var path6, MAX_SAVED_SESSIONS;
+var path7, MAX_SAVED_SESSIONS;
 var init_saved_sessions = __esm({
   "../../oss/packages/daemon-core/src/config/saved-sessions.ts"() {
     "use strict";
-    path6 = __toESM(require("path"));
+    path7 = __toESM(require("path"));
     init_workspaces();
     init_summary_metadata();
     MAX_SAVED_SESSIONS = 500;
@@ -2198,10 +2327,10 @@ function getMeshConfigPath() {
   return (0, import_path2.join)(getConfigDir(), "meshes.json");
 }
 function loadMeshConfig() {
-  const path33 = getMeshConfigPath();
-  if (!(0, import_fs2.existsSync)(path33)) return { meshes: [] };
+  const path34 = getMeshConfigPath();
+  if (!(0, import_fs2.existsSync)(path34)) return { meshes: [] };
   try {
-    const raw = JSON.parse((0, import_fs2.readFileSync)(path33, "utf-8"));
+    const raw = JSON.parse((0, import_fs2.readFileSync)(path34, "utf-8"));
     if (!raw || !Array.isArray(raw.meshes)) return { meshes: [] };
     return raw;
   } catch {
@@ -2209,16 +2338,16 @@ function loadMeshConfig() {
   }
 }
 function saveMeshConfig(config2) {
-  const path33 = getMeshConfigPath();
-  (0, import_fs2.writeFileSync)(path33, JSON.stringify(config2, null, 2), { encoding: "utf-8", mode: 384 });
+  const path34 = getMeshConfigPath();
+  (0, import_fs2.writeFileSync)(path34, JSON.stringify(config2, null, 2), { encoding: "utf-8", mode: 384 });
 }
 function normalizeRepoIdentity(remoteUrl) {
   let identity = remoteUrl.trim();
   if (identity.startsWith("http://") || identity.startsWith("https://")) {
     try {
       const url2 = new URL(identity);
-      const path33 = url2.pathname.replace(/^\//, "").replace(/\.git$/, "");
-      return `${url2.hostname}/${path33}`;
+      const path34 = url2.pathname.replace(/^\//, "").replace(/\.git$/, "");
+      return `${url2.hostname}/${path34}`;
     } catch {
     }
   }
@@ -2293,9 +2422,12 @@ function addNode(meshId, opts) {
     id: `node_${(0, import_crypto3.randomUUID)().replace(/-/g, "")}`,
     workspace: opts.workspace.trim(),
     repoRoot: opts.repoRoot,
+    daemonId: opts.daemonId,
     userOverrides: opts.userOverrides || {},
     policy: opts.policy || {},
-    isLocalWorktree: opts.isLocalWorktree
+    isLocalWorktree: opts.isLocalWorktree,
+    worktreeBranch: opts.worktreeBranch,
+    clonedFromNodeId: opts.clonedFromNodeId
   };
   mesh.nodes.push(node);
   mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -2343,7 +2475,7 @@ __export(coordinator_prompt_exports, {
   buildCoordinatorSystemPrompt: () => buildCoordinatorSystemPrompt
 });
 function buildCoordinatorSystemPrompt(ctx) {
-  const { mesh, status, userInstruction } = ctx;
+  const { mesh, status, userInstruction, coordinatorCliType } = ctx;
   const sections = [];
   sections.push(`You are a **Repo Mesh Coordinator** \u2014 a technical team lead who orchestrates work across multiple agent sessions on a shared Git repository.
 
@@ -2357,15 +2489,15 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
   } else {
     sections.push("## Nodes\nNo nodes configured yet. Ask the user to add nodes with `adhdev mesh add-node`.");
   }
-  sections.push(buildPolicySection(mesh.policy));
+  sections.push(buildPolicySection({ ...DEFAULT_MESH_POLICY, ...mesh.policy || {} }));
   sections.push(TOOLS_SECTION);
   sections.push(WORKFLOW_SECTION);
-  sections.push(RULES_SECTION);
+  sections.push(buildRulesSection(coordinatorCliType));
   if (userInstruction) {
     sections.push(`## Additional Context
 ${userInstruction}`);
   }
-  if (mesh.coordinator.systemPromptSuffix) {
+  if (mesh.coordinator?.systemPromptSuffix) {
     sections.push(mesh.coordinator.systemPromptSuffix);
   }
   return sections.join("\n\n");
@@ -2410,10 +2542,29 @@ function buildPolicySection(policy) {
   return `## Policy
 ${rules.join("\n")}`;
 }
-var TOOLS_SECTION, WORKFLOW_SECTION, RULES_SECTION;
+function buildRulesSection(coordinatorCliType) {
+  const coordinatorNote = coordinatorCliType ? `
+- **Coordinator runtime is not a delegation default.** This coordinator is running as \`${coordinatorCliType}\`, but delegated node sessions must follow the user's requested provider, not the coordinator's own runtime.` : "";
+  return `## Rules
+
+- **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.
+- **Respect explicit provider requests.** If the user names an agent/provider, pass the matching provider type to \`mesh_launch_session\`: Hermes \u2192 \`hermes-cli\`, Claude Code/Claude \u2192 \`claude-cli\`, Codex \u2192 \`codex-cli\`, Gemini \u2192 \`gemini-cli\`. Never substitute \`claude-cli\` just because the coordinator itself is Claude Code.
+- **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 \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.
+- **Clean up worktree nodes.** After a worktree task completes and its changes are merged or checkpointed, call \`mesh_remove_node\` to free resources.
+- **Name worktree branches meaningfully.** Use descriptive names like \`feat/auth-refactor\` or \`fix/build-123\`.${coordinatorNote}`;
+}
+var TOOLS_SECTION, WORKFLOW_SECTION;
 var init_coordinator_prompt = __esm({
   "../../oss/packages/daemon-core/src/mesh/coordinator-prompt.ts"() {
     "use strict";
+    init_repo_mesh_types();
     TOOLS_SECTION = `## Available Tools
 
 | Tool | Purpose |
@@ -2425,30 +2576,23 @@ var init_coordinator_prompt = __esm({
 | \`mesh_read_chat\` | Read an agent's recent messages to check progress |
 | \`mesh_git_status\` | Check git status on a specific node |
 | \`mesh_checkpoint\` | Create a git checkpoint on a node |
-| \`mesh_approve\` | Approve/reject a pending agent action |`;
+| \`mesh_approve\` | Approve/reject a pending agent action |
+| \`mesh_clone_node\` | Create a worktree node for isolated parallel branch work |
+| \`mesh_remove_node\` | Remove a node (cleans up worktree if applicable) |`;
     WORKFLOW_SECTION = `## Orchestration Workflow
 
 1. **Assess** \u2014 Call \`mesh_status\` to see which nodes are healthy and available.
 2. **Plan** \u2014 Decompose the user's request into independent tasks for parallel execution, or sequential tasks when dependencies exist.
 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 **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.
+   b. If you need branch isolation for parallel work, call \`mesh_clone_node\` to create a worktree node first.
+   c. If no session exists, call \`mesh_launch_session\` to start one.
+   d. 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
-
-- **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 \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.`;
+7. **Clean up** \u2014 Remove worktree nodes via \`mesh_remove_node\` after their work is merged or no longer needed.
+8. **Report** \u2014 Summarize what was done, what changed, and any issues.`;
   }
 });
 
@@ -2607,9 +2751,9 @@ function getMergedDefinitions() {
 function findCliCommand(command) {
   const trimmed = String(command || "").trim();
   if (!trimmed) return null;
-  if (path7.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
-    const candidate = trimmed.startsWith("~") ? path7.join((0, import_os2.homedir)(), trimmed.slice(1)) : trimmed;
-    const resolved = path7.isAbsolute(candidate) ? candidate : path7.resolve(candidate);
+  if (path8.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
+    const candidate = trimmed.startsWith("~") ? path8.join((0, import_os2.homedir)(), trimmed.slice(1)) : trimmed;
+    const resolved = path8.isAbsolute(candidate) ? candidate : path8.resolve(candidate);
     return (0, import_fs4.existsSync)(resolved) ? resolved : null;
   }
   try {
@@ -2637,7 +2781,7 @@ function getIdeVersion(cliCommand) {
 function checkPathExists(paths) {
   const home = (0, import_os2.homedir)();
   for (const p of paths) {
-    const normalized = p.startsWith("~") ? path7.join(home, p.slice(1)) : p;
+    const normalized = p.startsWith("~") ? path8.join(home, p.slice(1)) : p;
     if (normalized.includes("*")) {
       const username = home.split(/[\\/]/).pop() || "";
       const resolved = normalized.replace("*", username);
@@ -2660,8 +2804,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs4.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os29 === "win32") {
-      const { dirname: dirname11 } = await import("path");
-      const appDir = dirname11(appPath);
+      const { dirname: dirname12 } = await import("path");
+      const appDir = dirname12(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -2691,14 +2835,14 @@ async function detectIDEs(providerLoader) {
   }
   return results;
 }
-var import_child_process, import_fs4, import_os2, path7, BUILTIN_IDE_DEFINITIONS, registeredIDEs;
+var import_child_process, import_fs4, import_os2, path8, BUILTIN_IDE_DEFINITIONS, registeredIDEs;
 var init_ide_detector = __esm({
   "../../oss/packages/daemon-core/src/detection/ide-detector.ts"() {
     "use strict";
     import_child_process = require("child_process");
     import_fs4 = require("fs");
     import_os2 = require("os");
-    path7 = __toESM(require("path"));
+    path8 = __toESM(require("path"));
     BUILTIN_IDE_DEFINITIONS = [];
     registeredIDEs = /* @__PURE__ */ new Map();
   }
@@ -2716,18 +2860,18 @@ function shellQuote(value) {
 function expandHome(value) {
   const trimmed = value.trim();
   if (!trimmed.startsWith("~")) return trimmed;
-  return path8.join(os2.homedir(), trimmed.slice(1));
+  return path9.join(os2.homedir(), trimmed.slice(1));
 }
 function isExplicitCommandPath(command) {
   const trimmed = command.trim();
-  return path8.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
+  return path9.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
 }
 function resolveCommandPath(command) {
   const trimmed = command.trim();
   if (!trimmed) return null;
   if (isExplicitCommandPath(trimmed)) {
     const expanded = expandHome(trimmed);
-    const candidate = path8.isAbsolute(expanded) ? expanded : path8.resolve(expanded);
+    const candidate = path9.isAbsolute(expanded) ? expanded : path9.resolve(expanded);
     return (0, import_fs5.existsSync)(candidate) ? candidate : null;
   }
   return null;
@@ -2828,13 +2972,13 @@ async function detectCLI(cliId, providerLoader, options) {
   const all = await detectCLIs(providerLoader, options);
   return all.find((c) => c.id === resolvedId && c.installed) || null;
 }
-var import_child_process2, os2, path8, import_fs5;
+var import_child_process2, os2, path9, import_fs5;
 var init_cli_detector = __esm({
   "../../oss/packages/daemon-core/src/detection/cli-detector.ts"() {
     "use strict";
     import_child_process2 = require("child_process");
     os2 = __toESM(require("os"));
-    path8 = __toESM(require("path"));
+    path9 = __toESM(require("path"));
     import_fs5 = require("fs");
   }
 });
@@ -3043,13 +3187,13 @@ function getDaemonLogDir() {
   return LOG_DIR;
 }
 function getCurrentDaemonLogPath(date5 = /* @__PURE__ */ new Date()) {
-  return path9.join(LOG_DIR, `daemon-${date5.toISOString().slice(0, 10)}.log`);
+  return path10.join(LOG_DIR, `daemon-${date5.toISOString().slice(0, 10)}.log`);
 }
 function checkDateRotation() {
   const today = getDateStr();
   if (today !== currentDate) {
     currentDate = today;
-    currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path10.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
   }
 }
@@ -3063,7 +3207,7 @@ function cleanOldLogs() {
       const dateMatch = file2.match(/daemon-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs2.unlinkSync(path9.join(LOG_DIR, file2));
+          fs2.unlinkSync(path10.join(LOG_DIR, file2));
         } catch {
         }
       }
@@ -3179,17 +3323,17 @@ function installGlobalInterceptor() {
   writeToFile(`Log file: ${currentLogFile}`);
   writeToFile(`Log level: ${currentLevel}`);
 }
-var fs2, path9, os4, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH;
+var fs2, path10, os4, LEVEL_NUM, LEVEL_LABEL, currentLevel, LOG_DIR, MAX_LOG_SIZE, MAX_LOG_DAYS, currentDate, currentLogFile, writeCount, RING_BUFFER_SIZE, ringBuffer, origConsoleLog, origConsoleError, origConsoleWarn, LOG, interceptorInstalled, LOG_PATH;
 var init_logger = __esm({
   "../../oss/packages/daemon-core/src/logging/logger.ts"() {
     "use strict";
     fs2 = __toESM(require("fs"));
-    path9 = __toESM(require("path"));
+    path10 = __toESM(require("path"));
     os4 = __toESM(require("os"));
     LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
     LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
     currentLevel = "info";
-    LOG_DIR = process.platform === "win32" ? path9.join(process.env.LOCALAPPDATA || process.env.APPDATA || path9.join(os4.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os4.homedir(), "Library", "Logs", "adhdev") : path9.join(os4.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR = process.platform === "win32" ? path10.join(process.env.LOCALAPPDATA || process.env.APPDATA || path10.join(os4.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path10.join(os4.homedir(), "Library", "Logs", "adhdev") : path10.join(os4.homedir(), ".local", "share", "adhdev", "logs");
     MAX_LOG_SIZE = 5 * 1024 * 1024;
     MAX_LOG_DAYS = 7;
     try {
@@ -3197,16 +3341,16 @@ var init_logger = __esm({
     } catch {
     }
     currentDate = getDateStr();
-    currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path10.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
     try {
-      const oldLog = path9.join(LOG_DIR, "daemon.log");
+      const oldLog = path10.join(LOG_DIR, "daemon.log");
       if (fs2.existsSync(oldLog)) {
         const stat5 = fs2.statSync(oldLog);
         const oldDate = stat5.mtime.toISOString().slice(0, 10);
-        fs2.renameSync(oldLog, path9.join(LOG_DIR, `daemon-${oldDate}.log`));
+        fs2.renameSync(oldLog, path10.join(LOG_DIR, `daemon-${oldDate}.log`));
       }
-      const oldLogBackup = path9.join(LOG_DIR, "daemon.log.old");
+      const oldLogBackup = path10.join(LOG_DIR, "daemon.log.old");
       if (fs2.existsSync(oldLogBackup)) {
         fs2.unlinkSync(oldLogBackup);
       }
@@ -3238,7 +3382,7 @@ var init_logger = __esm({
       }
     };
     interceptorInstalled = false;
-    LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
+    LOG_PATH = path10.join(LOG_DIR, `daemon-${getDateStr()}.log`);
   }
 });
 
@@ -5428,7 +5572,7 @@ function extractSavedHistorySessionIdFromFile(file2) {
 function buildSavedHistoryFileSignatureMap(dir, files) {
   return new Map(files.map((file2) => {
     try {
-      const stat5 = fs3.statSync(path10.join(dir, file2));
+      const stat5 = fs3.statSync(path11.join(dir, file2));
       return [file2, `${file2}:${stat5.size}:${Math.trunc(stat5.mtimeMs)}`];
     } catch {
       return [file2, `${file2}:missing`];
@@ -5439,7 +5583,7 @@ function buildSavedHistoryCacheSignature(files, fileSignatures) {
   return files.map((file2) => fileSignatures.get(file2) || `${file2}:missing`).join("|");
 }
 function getSavedHistoryIndexFilePath(dir) {
-  return path10.join(dir, SAVED_HISTORY_INDEX_FILE);
+  return path11.join(dir, SAVED_HISTORY_INDEX_FILE);
 }
 function getSavedHistoryIndexLockPath(dir) {
   return `${getSavedHistoryIndexFilePath(dir)}${SAVED_HISTORY_INDEX_LOCK_SUFFIX}`;
@@ -5541,7 +5685,7 @@ function savePersistedSavedHistoryIndex(dir, entries) {
     }
     for (const file2 of Array.from(currentEntries.keys())) {
       if (incomingFiles.has(file2)) continue;
-      if (!fs3.existsSync(path10.join(dir, file2))) {
+      if (!fs3.existsSync(path11.join(dir, file2))) {
         currentEntries.delete(file2);
       }
     }
@@ -5567,7 +5711,7 @@ function historyDirectoryHasFilesNewerThanIndex(dir) {
     const indexStat = fs3.statSync(getSavedHistoryIndexFilePath(dir));
     const files = listHistoryFiles(dir);
     for (const file2 of files) {
-      const stat5 = fs3.statSync(path10.join(dir, file2));
+      const stat5 = fs3.statSync(path11.join(dir, file2));
       if (stat5.mtimeMs > indexStat.mtimeMs) return true;
     }
     return false;
@@ -5577,14 +5721,14 @@ function historyDirectoryHasFilesNewerThanIndex(dir) {
 }
 function buildSavedHistoryFileSignature(dir, file2) {
   try {
-    const stat5 = fs3.statSync(path10.join(dir, file2));
+    const stat5 = fs3.statSync(path11.join(dir, file2));
     return `${file2}:${stat5.size}:${Math.trunc(stat5.mtimeMs)}`;
   } catch {
     return `${file2}:missing`;
   }
 }
 function persistSavedHistoryFileSummaryEntry(agentType, dir, file2, updater) {
-  const filePath = path10.join(dir, file2);
+  const filePath = path11.join(dir, file2);
   const result = withLockedPersistedSavedHistoryIndex(dir, (entries) => {
     const currentEntry = entries.get(file2) || null;
     const nextSummary = updater(currentEntry?.summary || null);
@@ -5657,7 +5801,7 @@ function updateSavedHistoryIndexForAppendedMessages(agentType, dir, file2, histo
 function computeSavedHistoryFileSummary(dir, file2) {
   const historySessionId = extractSavedHistorySessionIdFromFile(file2);
   if (!historySessionId) return null;
-  const filePath = path10.join(dir, file2);
+  const filePath = path11.join(dir, file2);
   const content = fs3.readFileSync(filePath, "utf-8");
   const lines = content.split("\n").filter(Boolean);
   let messageCount = 0;
@@ -5744,7 +5888,7 @@ function computeSavedHistorySessionSummaries(agentType, dir, files, fileSignatur
   const summaryBySessionId = /* @__PURE__ */ new Map();
   const nextPersistedEntries = /* @__PURE__ */ new Map();
   for (const file2 of files.slice().sort()) {
-    const filePath = path10.join(dir, file2);
+    const filePath = path11.join(dir, file2);
     const signature = fileSignatures.get(file2) || `${file2}:missing`;
     const cached2 = savedHistoryFileSummaryCache.get(filePath);
     const persisted = persistedEntries.get(file2);
@@ -5826,13 +5970,13 @@ function pageHistoryRecords(agentType, records, offset = 0, limit = 30, excludeR
 function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0, historyBehavior) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const dir = path10.join(HISTORY_DIR, sanitized);
+    const dir = path11.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) return { messages: [], hasMore: false };
     const files = listHistoryFiles(dir, historySessionId);
     const allMessages = [];
     const seen = /* @__PURE__ */ new Set();
     for (const file2 of files) {
-      const filePath = path10.join(dir, file2);
+      const filePath = path11.join(dir, file2);
       const content = fs3.readFileSync(filePath, "utf-8");
       const lines = content.trim().split("\n").filter(Boolean);
       for (let i = 0; i < lines.length; i++) {
@@ -5856,7 +6000,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
 function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const dir = path10.join(HISTORY_DIR, sanitized);
+    const dir = path11.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) {
       savedHistorySessionCache.delete(sanitized);
       return { sessions: [], hasMore: false };
@@ -5917,11 +6061,11 @@ function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
 }
 function readExistingSessionStartRecord(agentType, historySessionId) {
   try {
-    const dir = path10.join(HISTORY_DIR, agentType);
+    const dir = path11.join(HISTORY_DIR, agentType);
     if (!fs3.existsSync(dir)) return null;
     const files = listHistoryFiles(dir, historySessionId).sort();
     for (const file2 of files) {
-      const lines = fs3.readFileSync(path10.join(dir, file2), "utf-8").split("\n").filter(Boolean);
+      const lines = fs3.readFileSync(path11.join(dir, file2), "utf-8").split("\n").filter(Boolean);
       for (const line of lines) {
         try {
           const parsed = JSON.parse(line);
@@ -5941,16 +6085,16 @@ function readExistingSessionStartRecord(agentType, historySessionId) {
 function rewriteCanonicalSavedHistory(agentType, historySessionId, records) {
   if (records.length === 0) return false;
   try {
-    const dir = path10.join(HISTORY_DIR, agentType);
+    const dir = path11.join(HISTORY_DIR, agentType);
     fs3.mkdirSync(dir, { recursive: true });
     const prefix = `${historySessionId.replace(/[^a-zA-Z0-9_-]/g, "_")}_`;
     for (const file2 of fs3.readdirSync(dir)) {
       if (file2.startsWith(prefix) && file2.endsWith(".jsonl")) {
-        fs3.unlinkSync(path10.join(dir, file2));
+        fs3.unlinkSync(path11.join(dir, file2));
       }
     }
     const targetDate = new Date(records[records.length - 1].receivedAt || Date.now()).toISOString().slice(0, 10);
-    const filePath = path10.join(dir, `${prefix}${targetDate}.jsonl`);
+    const filePath = path11.join(dir, `${prefix}${targetDate}.jsonl`);
     fs3.writeFileSync(filePath, `${records.map((record2) => JSON.stringify(record2)).join("\n")}
 `, "utf-8");
     invalidatePersistedSavedHistoryIndex(agentType, dir);
@@ -6148,15 +6292,15 @@ function listProviderHistorySessions(agentType, options = {}) {
     source: "adhdev-mirror"
   };
 }
-var fs3, path10, os5, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, ChatHistoryWriter;
+var fs3, path11, os5, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
     "use strict";
     fs3 = __toESM(require("fs"));
-    path10 = __toESM(require("path"));
+    path11 = __toESM(require("path"));
     os5 = __toESM(require("os"));
     init_chat_message_normalization();
-    HISTORY_DIR = path10.join(os5.homedir(), ".adhdev", "history");
+    HISTORY_DIR = path11.join(os5.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
     SAVED_HISTORY_INDEX_VERSION = 1;
     SAVED_HISTORY_INDEX_FILE = ".saved-history-index.json";
@@ -6238,12 +6382,12 @@ var init_chat_history = __esm({
             });
           }
           if (newMessages.length === 0) return;
-          const dir = path10.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path11.join(HISTORY_DIR, this.sanitize(agentType));
           fs3.mkdirSync(dir, { recursive: true });
           const date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
           const filePrefix = effectiveHistoryKey ? `${this.sanitize(effectiveHistoryKey)}_` : "";
           const fileName = `${filePrefix}${date5}.jsonl`;
-          const filePath = path10.join(dir, fileName);
+          const filePath = path11.join(dir, fileName);
           const lines = newMessages.map((m) => JSON.stringify(m)).join("\n") + "\n";
           fs3.appendFileSync(filePath, lines, "utf-8");
           updateSavedHistoryIndexForAppendedMessages(agentType, dir, fileName, effectiveHistoryKey, newMessages);
@@ -6334,11 +6478,11 @@ var init_chat_history = __esm({
         const ws = String(workspace || "").trim();
         if (!id || !ws) return;
         try {
-          const dir = path10.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path11.join(HISTORY_DIR, this.sanitize(agentType));
           fs3.mkdirSync(dir, { recursive: true });
           const date5 = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
           const fileName = `${this.sanitize(id)}_${date5}.jsonl`;
-          const filePath = path10.join(dir, fileName);
+          const filePath = path11.join(dir, fileName);
           const record2 = {
             ts: (/* @__PURE__ */ new Date()).toISOString(),
             receivedAt: Date.now(),
@@ -6384,14 +6528,14 @@ var init_chat_history = __esm({
             this.lastSeenCounts.set(toDedupKey, Math.max(fromCount, this.lastSeenCounts.get(toDedupKey) || 0));
             this.lastSeenCounts.delete(fromDedupKey);
           }
-          const dir = path10.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path11.join(HISTORY_DIR, this.sanitize(agentType));
           if (!fs3.existsSync(dir)) return;
           const fromPrefix = `${this.sanitize(fromId)}_`;
           const toPrefix = `${this.sanitize(toId)}_`;
           const files = fs3.readdirSync(dir).filter((file2) => file2.startsWith(fromPrefix) && file2.endsWith(".jsonl"));
           for (const file2 of files) {
-            const sourcePath = path10.join(dir, file2);
-            const targetPath = path10.join(dir, `${toPrefix}${file2.slice(fromPrefix.length)}`);
+            const sourcePath = path11.join(dir, file2);
+            const targetPath = path11.join(dir, `${toPrefix}${file2.slice(fromPrefix.length)}`);
             const sourceLines = fs3.readFileSync(sourcePath, "utf-8").split("\n").filter(Boolean);
             const rewritten = sourceLines.map((line) => {
               try {
@@ -6425,13 +6569,13 @@ var init_chat_history = __esm({
         const sessionId = String(historySessionId || "").trim();
         if (!sessionId) return;
         try {
-          const dir = path10.join(HISTORY_DIR, this.sanitize(agentType));
+          const dir = path11.join(HISTORY_DIR, this.sanitize(agentType));
           if (!fs3.existsSync(dir)) return;
           const prefix = `${this.sanitize(sessionId)}_`;
           const files = fs3.readdirSync(dir).filter((file2) => file2.startsWith(prefix) && file2.endsWith(".jsonl")).sort();
           const seen = /* @__PURE__ */ new Set();
           for (const file2 of files) {
-            const filePath = path10.join(dir, file2);
+            const filePath = path11.join(dir, file2);
             const lines = fs3.readFileSync(filePath, "utf-8").split("\n").filter(Boolean);
             const next = [];
             for (const line of lines) {
@@ -6485,11 +6629,11 @@ var init_chat_history = __esm({
           const cutoff = Date.now() - RETAIN_DAYS * 24 * 60 * 60 * 1e3;
           const agentDirs = fs3.readdirSync(HISTORY_DIR, { withFileTypes: true }).filter((d) => d.isDirectory());
           for (const dir of agentDirs) {
-            const dirPath = path10.join(HISTORY_DIR, dir.name);
+            const dirPath = path11.join(HISTORY_DIR, dir.name);
             const files = fs3.readdirSync(dirPath).filter((f) => f.endsWith(".jsonl") || f.endsWith(".terminal.log"));
             let removedAny = false;
             for (const file2 of files) {
-              const filePath = path10.join(dirPath, file2);
+              const filePath = path11.join(dirPath, file2);
               const stat5 = fs3.statSync(filePath);
               if (stat5.mtimeMs < cutoff) {
                 fs3.unlinkSync(filePath);
@@ -8397,6 +8541,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";
 }
@@ -8452,9 +8604,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 },
@@ -8489,9 +8639,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 },
@@ -8541,9 +8689,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 },
@@ -8591,9 +8737,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 },
@@ -9317,7 +9461,7 @@ function buildDebugBundleText(bundle) {
 }
 function getChatDebugBundleDir() {
   const override = typeof process.env.ADHDEV_DEBUG_BUNDLE_DIR === "string" ? process.env.ADHDEV_DEBUG_BUNDLE_DIR.trim() : "";
-  return override || path11.join(os6.homedir(), ".adhdev", "debug-bundles", "chat");
+  return override || path12.join(os6.homedir(), ".adhdev", "debug-bundles", "chat");
 }
 function safeBundleIdSegment(value, fallback2) {
   const normalized = String(value || fallback2).trim().replace(/[^A-Za-z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80);
@@ -9350,7 +9494,7 @@ function storeChatDebugBundleOnDaemon(bundle, targetSessionId) {
   const bundleId = createChatDebugBundleId(targetSessionId);
   const dir = getChatDebugBundleDir();
   fs4.mkdirSync(dir, { recursive: true });
-  const savedPath = path11.join(dir, `${bundleId}.json`);
+  const savedPath = path12.join(dir, `${bundleId}.json`);
   const json2 = `${JSON.stringify(bundle, null, 2)}
 `;
   fs4.writeFileSync(savedPath, json2, { encoding: "utf8", mode: 384 });
@@ -10491,13 +10635,13 @@ async function handleResolveAction(h, args) {
   }
   return { success: false, error: "resolveAction script not available for this provider" };
 }
-var fs4, os6, path11, import_node_crypto, RECENT_SEND_WINDOW_MS, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS, recentSendByTarget, DEFAULT_DEBUG_SANITIZE_OPTIONS, SECRET_KEY_PATTERN;
+var fs4, os6, path12, import_node_crypto, RECENT_SEND_WINDOW_MS, READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS, recentSendByTarget, DEFAULT_DEBUG_SANITIZE_OPTIONS, SECRET_KEY_PATTERN;
 var init_chat_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/chat-commands.ts"() {
     "use strict";
     fs4 = __toESM(require("fs"));
     os6 = __toESM(require("os"));
-    path11 = __toESM(require("path"));
+    path12 = __toESM(require("path"));
     import_node_crypto = require("crypto");
     init_contracts();
     init_provider_input_support();
@@ -10740,25 +10884,25 @@ function resolveSafePath(requestedPath) {
   const inputPath = rawPath || ".";
   const home = os7.homedir();
   if (inputPath.startsWith("~")) {
-    return path12.resolve(path12.join(home, inputPath.slice(1)));
+    return path13.resolve(path13.join(home, inputPath.slice(1)));
   }
   if (process.platform === "win32") {
     const normalized = normalizeWindowsRequestedPath(inputPath);
-    if (path12.win32.isAbsolute(normalized)) {
-      return path12.win32.normalize(normalized);
+    if (path13.win32.isAbsolute(normalized)) {
+      return path13.win32.normalize(normalized);
     }
-    return path12.win32.resolve(normalized);
+    return path13.win32.resolve(normalized);
   }
-  if (path12.isAbsolute(inputPath)) {
-    return path12.normalize(inputPath);
+  if (path13.isAbsolute(inputPath)) {
+    return path13.normalize(inputPath);
   }
-  return path12.resolve(inputPath);
+  return path13.resolve(inputPath);
 }
 function listDirectoryEntriesSafe(dirPath) {
   const entries = fs5.readdirSync(dirPath, { withFileTypes: true });
   const files = [];
   for (const entry of entries) {
-    const entryPath = path12.join(dirPath, entry.name);
+    const entryPath = path13.join(dirPath, entry.name);
     try {
       if (entry.isDirectory()) {
         files.push({ name: entry.name, type: "directory" });
@@ -10812,7 +10956,7 @@ async function handleFileRead(h, args) {
 async function handleFileWrite(h, args) {
   try {
     const filePath = resolveSafePath(args?.path);
-    fs5.mkdirSync(path12.dirname(filePath), { recursive: true });
+    fs5.mkdirSync(path13.dirname(filePath), { recursive: true });
     fs5.writeFileSync(filePath, args?.content || "", "utf-8");
     return { success: true, path: filePath };
   } catch (e) {
@@ -10845,12 +10989,12 @@ async function handleFileListBrowse(h, args) {
     return { success: false, error: e.message };
   }
 }
-var fs5, path12, os7, KEY_TO_VK;
+var fs5, path13, os7, KEY_TO_VK;
 var init_cdp_commands = __esm({
   "../../oss/packages/daemon-core/src/commands/cdp-commands.ts"() {
     "use strict";
     fs5 = __toESM(require("fs"));
-    path12 = __toESM(require("path"));
+    path13 = __toESM(require("path"));
     os7 = __toESM(require("os"));
     KEY_TO_VK = {
       Backspace: 8,
@@ -13148,9 +13292,9 @@ function buildCliScreenSnapshot(text) {
 function findBinary(name) {
   const trimmed = String(name || "").trim();
   if (!trimmed) return trimmed;
-  const expanded = trimmed.startsWith("~") ? path13.join(os11.homedir(), trimmed.slice(1)) : trimmed;
-  if (path13.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
-    return path13.isAbsolute(expanded) ? expanded : path13.resolve(expanded);
+  const expanded = trimmed.startsWith("~") ? path14.join(os11.homedir(), trimmed.slice(1)) : trimmed;
+  if (path14.isAbsolute(expanded) || expanded.includes("/") || expanded.includes("\\")) {
+    return path14.isAbsolute(expanded) ? expanded : path14.resolve(expanded);
   }
   const isWin = os11.platform() === "win32";
   try {
@@ -13166,7 +13310,7 @@ function findBinary(name) {
   }
 }
 function isScriptBinary(binaryPath) {
-  if (!path13.isAbsolute(binaryPath)) return false;
+  if (!path14.isAbsolute(binaryPath)) return false;
   try {
     const fs20 = require("fs");
     const resolved = fs20.realpathSync(binaryPath);
@@ -13182,7 +13326,7 @@ function isScriptBinary(binaryPath) {
   }
 }
 function looksLikeMachOOrElf(filePath) {
-  if (!path13.isAbsolute(filePath)) return false;
+  if (!path14.isAbsolute(filePath)) return false;
   try {
     const fs20 = require("fs");
     const resolved = fs20.realpathSync(filePath);
@@ -13271,12 +13415,12 @@ function normalizeCliProviderForRuntime(raw) {
     }
   };
 }
-var os11, path13, import_child_process4, buildCliSpawnEnv;
+var os11, path14, import_child_process4, buildCliSpawnEnv;
 var init_provider_cli_shared = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-shared.ts"() {
     "use strict";
     os11 = __toESM(require("os"));
-    path13 = __toESM(require("path"));
+    path14 = __toESM(require("path"));
     import_child_process4 = require("child_process");
     init_spawn_env();
     buildCliSpawnEnv = sanitizeSpawnEnv;
@@ -13407,9 +13551,9 @@ function resolveCliSpawnPlan(options) {
   const allArgs = [...spawnConfig.args, ...extraArgs];
   let shellCmd;
   let shellArgs;
-  const useShellUnix = !isWin && (!!spawnConfig.shell || !path14.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
+  const useShellUnix = !isWin && (!!spawnConfig.shell || !path15.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
   const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-  const useShellWin = !!spawnConfig.shell || isCmdShim || !path14.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+  const useShellWin = !!spawnConfig.shell || isCmdShim || !path15.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
   const useShell = isWin ? useShellWin : useShellUnix;
   if (useShell) {
     shellCmd = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
@@ -13485,12 +13629,12 @@ function respondToCliTerminalQueries(options) {
   }
   return "";
 }
-var os12, path14;
+var os12, path15;
 var init_provider_cli_runtime = __esm({
   "../../oss/packages/daemon-core/src/cli-adapters/provider-cli-runtime.ts"() {
     "use strict";
     os12 = __toESM(require("os"));
-    path14 = __toESM(require("path"));
+    path15 = __toESM(require("path"));
     init_dist();
     init_provider_cli_shared();
   }
@@ -13678,8 +13822,9 @@ var init_provider_cli_adapter = __esm({
         const currentSnapshot = normalizeScreenSnapshot(screenText);
         const lastSnapshot = this.lastScreenSnapshot;
         if (!lastSnapshot || lastSnapshot === currentSnapshot) return screenText;
-        const staleSnapshotLooksActive = /\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(lastSnapshot);
-        const currentScreenLooksIdle = /(?:^|\n|\r)\s*[❯›>]\s*(?:\n|\r|$)/.test(screenText) && !/\besc to (?:interrupt|stop)\b|Enter to interrupt, Ctrl\+C to cancel/i.test(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}
@@ -15615,7 +15760,7 @@ function buildIncrementalHistoryAppendMessages(previousMessages, currentMessages
 }
 function getDatabaseSync() {
   if (CachedDatabaseSync) return CachedDatabaseSync;
-  const requireFn = typeof require === "function" ? require : (0, import_node_module.createRequire)(path15.join(process.cwd(), "__adhdev_sqlite_loader__.js"));
+  const requireFn = typeof require === "function" ? require : (0, import_node_module.createRequire)(path16.join(process.cwd(), "__adhdev_sqlite_loader__.js"));
   const sqliteModule = requireFn(`node:${"sqlite"}`);
   CachedDatabaseSync = sqliteModule.DatabaseSync;
   if (!CachedDatabaseSync) {
@@ -15657,12 +15802,12 @@ async function waitForCliAdapterReady(adapter, options) {
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
-var os14, path15, crypto3, fs6, import_node_module, CachedDatabaseSync, CliProviderInstance;
+var os14, path16, crypto3, fs6, import_node_module, CachedDatabaseSync, CliProviderInstance;
 var init_cli_provider_instance = __esm({
   "../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts"() {
     "use strict";
     os14 = __toESM(require("os"));
-    path15 = __toESM(require("path"));
+    path16 = __toESM(require("path"));
     crypto3 = __toESM(require("crypto"));
     fs6 = __toESM(require("fs"));
     import_node_module = require("module");
@@ -16798,10 +16943,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path33) {
-  if (!path33)
+function getElementAtPath(obj, path34) {
+  if (!path34)
     return obj;
-  return path33.reduce((acc, key) => acc?.[key], obj);
+  return path34.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -17113,11 +17258,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path33, issues) {
+function prefixIssues(path34, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path33);
+    iss.path.unshift(path34);
     return iss;
   });
 }
@@ -17360,7 +17505,7 @@ function formatError(error48, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error48, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error49, path33 = []) => {
+  const processError = (error49, path34 = []) => {
     var _a2, _b;
     for (const issue2 of error49.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
@@ -17370,7 +17515,7 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
       } else if (issue2.code === "invalid_element") {
         processError({ issues: issue2.issues }, issue2.path);
       } else {
-        const fullpath = [...path33, ...issue2.path];
+        const fullpath = [...path34, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -17402,8 +17547,8 @@ function treeifyError(error48, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path33 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path33) {
+  const path34 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path34) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -30167,13 +30312,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path33 = ref.slice(1).split("/").filter(Boolean);
-  if (path33.length === 0) {
+  const path34 = ref.slice(1).split("/").filter(Boolean);
+  if (path34.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path33[0] === defsKey) {
-    const key = path33[1];
+  if (path34[0] === defsKey) {
+    const key = path34[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -34019,11 +34164,11 @@ var init_hosted_runtime_restore = __esm({
 // ../../oss/packages/daemon-core/src/commands/cli-manager.ts
 function isExplicitCommand(command) {
   const trimmed = command.trim();
-  return path16.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
+  return path17.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
 }
 function expandExecutable(command) {
   const trimmed = command.trim();
-  return trimmed.startsWith("~") ? path16.join(os15.homedir(), trimmed.slice(1)) : trimmed;
+  return trimmed.startsWith("~") ? path17.join(os15.homedir(), trimmed.slice(1)) : trimmed;
 }
 function commandExists(command) {
   const trimmed = command.trim();
@@ -34160,12 +34305,12 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
     launchMode: "new"
   };
 }
-var os15, path16, crypto4, import_fs6, import_child_process6, chalkModule, chalkApi, DaemonCliManager;
+var os15, path17, crypto4, import_fs6, import_child_process6, chalkModule, chalkApi, DaemonCliManager;
 var init_cli_manager = __esm({
   "../../oss/packages/daemon-core/src/commands/cli-manager.ts"() {
     "use strict";
     os15 = __toESM(require("os"));
-    path16 = __toESM(require("path"));
+    path17 = __toESM(require("path"));
     crypto4 = __toESM(require("crypto"));
     import_fs6 = require("fs");
     import_child_process6 = require("child_process");
@@ -34328,7 +34473,7 @@ var init_cli_manager = __esm({
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os15.homedir()) : path16.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os15.homedir()) : path17.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const rawProvider = this.providerLoader.getByAlias(cliType);
         const provider = rawProvider ? this.providerLoader.resolve(normalizedType) || rawProvider : void 0;
@@ -34827,7 +34972,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")
@@ -34844,13 +34989,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_promises4, 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_promises4 = require("fs/promises");
     import_node_stream = require("stream");
+    import_node_path = require("path");
     EntryTypes = {
       FILE_TYPE: "files",
       DIR_TYPE: "directories",
@@ -34905,20 +35050,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,13 +35060,13 @@ var init_readdirp = __esm({
         const { root, type } = opts;
         this._fileFilter = normalizeFilter(opts.fileFilter);
         this._directoryFilter = normalizeFilter(opts.directoryFilter);
-        const statMethod = opts.lstat ? import_promises3.lstat : import_promises3.stat;
+        const statMethod = opts.lstat ? import_promises4.lstat : import_promises4.stat;
         if (wantBigintFsStats) {
-          this._stat = (path33) => statMethod(path33, { bigint: true });
+          this._stat = (path34) => statMethod(path34, { bigint: true });
         } 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;
@@ -34956,8 +35087,8 @@ var init_readdirp = __esm({
             const par = this.parent;
             const fil = par && par.files;
             if (fil && fil.length > 0) {
-              const { path: path33, depth } = par;
-              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path33));
+              const { path: path34, depth } = par;
+              const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path34));
               const awaited = await Promise.all(slice);
               for (const entry of awaited) {
                 if (!entry)
@@ -34997,20 +35128,20 @@ var init_readdirp = __esm({
           this.reading = false;
         }
       }
-      async _exploreDir(path33, depth) {
+      async _exploreDir(path34, depth) {
         let files;
         try {
-          files = await (0, import_promises3.readdir)(path33, this._rdOptions);
+          files = await (0, import_promises4.readdir)(path34, this._rdOptions);
         } catch (error48) {
           this._onError(error48);
         }
-        return { files, depth, path: path33 };
+        return { files, depth, path: path34 };
       }
-      async _formatEntry(dirent, path33) {
+      async _formatEntry(dirent, path34) {
         let entry;
         const basename9 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path33, basename9));
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path34, basename9));
           entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
@@ -35038,8 +35169,8 @@ var init_readdirp = __esm({
         if (stats && stats.isSymbolicLink()) {
           const full = entry.fullPath;
           try {
-            const entryRealPath = await (0, import_promises3.realpath)(full);
-            const entryRealPathStats = await (0, import_promises3.lstat)(entryRealPath);
+            const entryRealPath = await (0, import_promises4.realpath)(full);
+            const entryRealPathStats = await (0, import_promises4.lstat)(entryRealPath);
             if (entryRealPathStats.isFile()) {
               return "file";
             }
@@ -35066,17 +35197,17 @@ var init_readdirp = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/node_modules/chokidar/handler.js
-function createFsWatchInstance(path33, options, listener, errHandler, emitRaw) {
+// ../../oss/node_modules/chokidar/esm/handler.js
+function createFsWatchInstance(path34, 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));
+    listener(path34);
+    emitRaw(rawEvent, evPath, { watchedPath: path34 });
+    if (evPath && path34 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path34, evPath), KEY_LISTENERS, sysPath.join(path34, evPath));
     }
   };
   try {
-    return (0, import_node_fs2.watch)(path33, {
+    return (0, import_fs7.watch)(path34, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -35084,14 +35215,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_promises5, 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_promises4 = require("fs/promises");
-    import_node_os2 = require("os");
-    sp = __toESM(require("path"), 1);
+    import_fs7 = require("fs");
+    import_promises5 = require("fs/promises");
+    sysPath = __toESM(require("path"), 1);
+    import_os3 = require("os");
     STR_DATA = "data";
     STR_END = "end";
     STR_CLOSE = "close";
@@ -35102,7 +35233,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",
@@ -35116,7 +35247,7 @@ var init_handler2 = __esm({
     };
     EV = EVENTS;
     THROTTLE_MODE_WATCH = "watch";
-    statMethods = { lstat: import_promises4.lstat, stat: import_promises4.stat };
+    statMethods = { lstat: import_promises5.lstat, stat: import_promises5.stat };
     KEY_LISTENERS = "listeners";
     KEY_ERR = "errHandlers";
     KEY_RAW = "rawEmitters";
@@ -35384,7 +35515,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);
@@ -35425,12 +35556,12 @@ var init_handler2 = __esm({
         listener(val1, val2, val3);
       });
     };
-    setFsWatchListener = (path33, fullPath, options, handlers) => {
+    setFsWatchListener = (path34, fullPath, options, handlers) => {
       const { listener, errHandler, rawEmitter } = handlers;
       let cont = FsWatchInstances.get(fullPath);
       let watcher;
       if (!options.persistent) {
-        watcher = createFsWatchInstance(path33, options, listener, errHandler, rawEmitter);
+        watcher = createFsWatchInstance(path34, options, listener, errHandler, rawEmitter);
         if (!watcher)
           return;
         return watcher.close.bind(watcher);
@@ -35441,7 +35572,7 @@ var init_handler2 = __esm({
         addAndConvert(cont, KEY_RAW, rawEmitter);
       } else {
         watcher = createFsWatchInstance(
-          path33,
+          path34,
           options,
           fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
           errHandler,
@@ -35456,7 +35587,7 @@ var init_handler2 = __esm({
             cont.watcherUnusable = true;
           if (isWindows && error48.code === "EPERM") {
             try {
-              const fd = await (0, import_promises4.open)(path33, "r");
+              const fd = await (0, import_promises5.open)(path34, "r");
               await fd.close();
               broadcastErr(error48);
             } catch (err) {
@@ -35487,12 +35618,12 @@ var init_handler2 = __esm({
       };
     };
     FsWatchFileInstances = /* @__PURE__ */ new Map();
-    setFsWatchFileListener = (path33, fullPath, options, handlers) => {
+    setFsWatchFileListener = (path34, fullPath, options, handlers) => {
       const { listener, rawEmitter } = handlers;
       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) {
@@ -35503,13 +35634,13 @@ 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 });
             });
             const currmtime = curr.mtimeMs;
             if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-              foreach(cont.listeners, (listener2) => listener2(path33, curr));
+              foreach(cont.listeners, (listener2) => listener2(path34, curr));
             }
           })
         };
@@ -35520,15 +35651,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);
@@ -35539,13 +35668,13 @@ var init_handler2 = __esm({
        * @param listener on fs change
        * @returns closer for the watcher instance
        */
-      _watchWithNodeFs(path33, listener) {
+      _watchWithNodeFs(path34, listener) {
         const opts = this.fsw.options;
-        const directory = sp.dirname(path33);
-        const basename9 = sp.basename(path33);
+        const directory = sysPath.dirname(path34);
+        const basename9 = sysPath.basename(path34);
         const parent = this.fsw._getWatchedDir(directory);
         parent.add(basename9);
-        const absolutePath = sp.resolve(path33);
+        const absolutePath = sysPath.resolve(path34);
         const options = {
           persistent: opts.persistent
         };
@@ -35555,12 +35684,12 @@ var init_handler2 = __esm({
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
           options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
-          closer = setFsWatchFileListener(path33, absolutePath, options, {
+          closer = setFsWatchFileListener(path34, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
           });
         } else {
-          closer = setFsWatchListener(path33, absolutePath, options, {
+          closer = setFsWatchListener(path34, absolutePath, options, {
             listener,
             errHandler: this._boundHandleError,
             rawEmitter: this.fsw._emitRaw
@@ -35576,18 +35705,18 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname11 = sp.dirname(file2);
-        const basename9 = sp.basename(file2);
-        const parent = this.fsw._getWatchedDir(dirname11);
+        const dirname12 = sysPath.dirname(file2);
+        const basename9 = sysPath.basename(file2);
+        const parent = this.fsw._getWatchedDir(dirname12);
         let prevStats = stats;
         if (parent.has(basename9))
           return;
-        const listener = async (path33, newStats) => {
+        const listener = async (path34, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
             return;
           if (!newStats || newStats.mtimeMs === 0) {
             try {
-              const newStats2 = await (0, import_promises4.stat)(file2);
+              const newStats2 = await (0, import_promises5.stat)(file2);
               if (this.fsw.closed)
                 return;
               const at = newStats2.atimeMs;
@@ -35596,16 +35725,16 @@ var init_handler2 = __esm({
                 this.fsw._emit(EV.CHANGE, file2, newStats2);
               }
               if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-                this.fsw._closeFile(path33);
+                this.fsw._closeFile(path34);
                 prevStats = newStats2;
                 const closer2 = this._watchWithNodeFs(file2, listener);
                 if (closer2)
-                  this.fsw._addPathCloser(path33, closer2);
+                  this.fsw._addPathCloser(path34, closer2);
               } else {
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname11, basename9);
+              this.fsw._remove(dirname12, basename9);
             }
           } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
@@ -35632,7 +35761,7 @@ var init_handler2 = __esm({
        * @param item basename of this item
        * @returns true if no more processing is needed for this entry.
        */
-      async _handleSymlink(entry, directory, path33, item) {
+      async _handleSymlink(entry, directory, path34, item) {
         if (this.fsw.closed) {
           return;
         }
@@ -35642,7 +35771,7 @@ var init_handler2 = __esm({
           this.fsw._incrReadyCount();
           let linkPath;
           try {
-            linkPath = await (0, import_promises4.realpath)(path33);
+            linkPath = await (0, import_promises5.realpath)(path34);
           } catch (e) {
             this.fsw._emitReady();
             return true;
@@ -35652,12 +35781,12 @@ var init_handler2 = __esm({
           if (dir.has(item)) {
             if (this.fsw._symlinkPaths.get(full) !== linkPath) {
               this.fsw._symlinkPaths.set(full, linkPath);
-              this.fsw._emit(EV.CHANGE, path33, entry.stats);
+              this.fsw._emit(EV.CHANGE, path34, entry.stats);
             }
           } else {
             dir.add(item);
             this.fsw._symlinkPaths.set(full, linkPath);
-            this.fsw._emit(EV.ADD, path33, entry.stats);
+            this.fsw._emit(EV.ADD, path34, entry.stats);
           }
           this.fsw._emitReady();
           return true;
@@ -35668,9 +35797,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);
@@ -35687,9 +35815,9 @@ var init_handler2 = __esm({
             return;
           }
           const item = entry.path;
-          let path33 = sp.join(directory, item);
+          let path34 = sysPath.join(directory, item);
           current.add(item);
-          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path33, item)) {
+          if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path34, item)) {
             return;
           }
           if (this.fsw.closed) {
@@ -35698,8 +35826,8 @@ var init_handler2 = __esm({
           }
           if (item === target || !target && !previous.has(item)) {
             this.fsw._incrReadyCount();
-            path33 = sp.join(dir, sp.relative(dir, path33));
-            this._addToNodeFs(path33, initialAdd, wh, depth + 1);
+            path34 = sysPath.join(dir, sysPath.relative(dir, path34));
+            this._addToNodeFs(path34, initialAdd, wh, depth + 1);
           }
         }).on(EV.ERROR, this._boundHandleError);
         return new Promise((resolve20, reject) => {
@@ -35735,12 +35863,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;
@@ -35768,13 +35896,13 @@ var init_handler2 = __esm({
        * @param depth Child path actually targeted for watch
        * @param target Child path actually targeted for watch
        */
-      async _addToNodeFs(path33, initialAdd, priorWh, depth, target) {
+      async _addToNodeFs(path34, initialAdd, priorWh, depth, target) {
         const ready = this.fsw._emitReady;
-        if (this.fsw._isIgnored(path33) || this.fsw.closed) {
+        if (this.fsw._isIgnored(path34) || this.fsw.closed) {
           ready();
           return false;
         }
-        const wh = this.fsw._getWatchHelpers(path33);
+        const wh = this.fsw._getWatchHelpers(path34);
         if (priorWh) {
           wh.filterPath = (entry) => priorWh.filterPath(entry);
           wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -35790,8 +35918,8 @@ var init_handler2 = __esm({
           const follow = this.fsw.options.followSymlinks;
           let closer;
           if (stats.isDirectory()) {
-            const absPath = sp.resolve(path33);
-            const targetPath = follow ? await (0, import_promises4.realpath)(path33) : path33;
+            const absPath = sysPath.resolve(path34);
+            const targetPath = follow ? await (0, import_promises5.realpath)(path34) : path34;
             if (this.fsw.closed)
               return;
             closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -35801,29 +35929,29 @@ var init_handler2 = __esm({
               this.fsw._symlinkPaths.set(absPath, targetPath);
             }
           } else if (stats.isSymbolicLink()) {
-            const targetPath = follow ? await (0, import_promises4.realpath)(path33) : path33;
+            const targetPath = follow ? await (0, import_promises5.realpath)(path34) : path34;
             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);
+            closer = await this._handleDir(parent, stats, initialAdd, depth, path34, 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(path34), targetPath);
             }
           } else {
             closer = this._handleFile(wh.watchPath, stats, initialAdd);
           }
           ready();
           if (closer)
-            this.fsw._addPathCloser(path33, closer);
+            this.fsw._addPathCloser(path34, closer);
           return false;
         } catch (error48) {
           if (this.fsw._handleError(error48)) {
             ready();
-            return path33;
+            return path34;
           }
         }
       }
@@ -35831,7 +35959,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];
 }
@@ -35847,35 +35975,37 @@ 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;
     };
   }
   return () => false;
 }
-function normalizePath(path33) {
-  if (typeof path33 !== "string")
+function normalizePath(path34) {
+  if (typeof path34 !== "string")
     throw new Error("string expected");
-  path33 = sp2.normalize(path33);
-  path33 = path33.replace(/\\/g, "/");
+  path34 = sysPath2.normalize(path34);
+  path34 = path34.replace(/\\/g, "/");
   let prepend = false;
-  if (path33.startsWith("//"))
+  if (path34.startsWith("//"))
     prepend = true;
-  path33 = path33.replace(DOUBLE_SLASH_RE, "/");
+  const DOUBLE_SLASH_RE2 = /\/\//;
+  while (path34.match(DOUBLE_SLASH_RE2))
+    path34 = path34.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path33 = "/" + path33;
-  return path33;
+    path34 = "/" + path34;
+  return path34;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path33 = normalizePath(testString);
+  const path34 = normalizePath(testString);
   for (let index = 0; index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path33, stats)) {
+    if (pattern(path34, stats)) {
       return true;
     }
   }
@@ -35899,15 +36029,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_promises6, 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_promises5 = require("fs/promises");
-    sp2 = __toESM(require("path"), 1);
-    init_readdirp();
+    import_fs8 = require("fs");
+    import_promises6 = require("fs/promises");
+    import_events = require("events");
+    sysPath2 = __toESM(require("path"), 1);
+    init_esm();
     init_handler2();
     SLASH = "/";
     SLASH_SLASH = "//";
@@ -35915,7 +36045,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);
@@ -35932,31 +36062,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)));
-    normalizeIgnored = (cwd = "") => (path33) => {
-      if (typeof path33 === "string") {
-        return normalizePathToUnix(sp2.isAbsolute(path33) ? path33 : sp2.join(cwd, path33));
+    normalizePathToUnix = (path34) => toUnix(sysPath2.normalize(toUnix(path34)));
+    normalizeIgnored = (cwd = "") => (path34) => {
+      if (typeof path34 === "string") {
+        return normalizePathToUnix(sysPath2.isAbsolute(path34) ? path34 : sysPath2.join(cwd, path34));
       } else {
-        return path33;
+        return path34;
       }
     };
-    getAbsolutePath = (path33, cwd) => {
-      if (sp2.isAbsolute(path33)) {
-        return path33;
+    getAbsolutePath = (path34, cwd) => {
+      if (sysPath2.isAbsolute(path34)) {
+        return path34;
       }
-      return sp2.join(cwd, path33);
+      return sysPath2.join(cwd, path34);
     };
     EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
     DirEntry = class {
-      path;
-      _removeWatcher;
-      items;
       constructor(dir, removeWatcher) {
         this.path = dir;
         this._removeWatcher = removeWatcher;
@@ -35978,10 +36107,10 @@ var init_chokidar = __esm({
           return;
         const dir = this.path;
         try {
-          await (0, import_promises5.readdir)(dir);
+          await (0, import_promises6.readdir)(dir);
         } catch (err) {
           if (this._removeWatcher) {
-            this._removeWatcher(sp2.dirname(dir), sp2.basename(dir));
+            this._removeWatcher(sysPath2.dirname(dir), sysPath2.basename(dir));
           }
         }
       }
@@ -36008,19 +36137,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) {
+      constructor(path34, follow, fsw) {
         this.fsw = fsw;
-        const watchPath = path33;
-        this.path = path33 = path33.replace(REPLACER_RE, "");
+        const watchPath = path34;
+        this.path = path34 = path34.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)
@@ -36030,7 +36152,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;
@@ -36043,25 +36165,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();
@@ -36158,20 +36262,20 @@ var init_chokidar = __esm({
         this._closePromise = void 0;
         let paths = unifyPaths(paths_);
         if (cwd) {
-          paths = paths.map((path33) => {
-            const absPath = getAbsolutePath(path33, cwd);
+          paths = paths.map((path34) => {
+            const absPath = getAbsolutePath(path34, cwd);
             return absPath;
           });
         }
-        paths.forEach((path33) => {
-          this._removeIgnoredPath(path33);
+        paths.forEach((path34) => {
+          this._removeIgnoredPath(path34);
         });
         this._userIgnored = void 0;
         if (!this._readyCount)
           this._readyCount = 0;
         this._readyCount += paths.length;
-        Promise.all(paths.map(async (path33) => {
-          const res = await this._nodeFsHandler._addToNodeFs(path33, !_internal, void 0, 0, _origAdd);
+        Promise.all(paths.map(async (path34) => {
+          const res = await this._nodeFsHandler._addToNodeFs(path34, !_internal, void 0, 0, _origAdd);
           if (res)
             this._emitReady();
           return res;
@@ -36180,7 +36284,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;
@@ -36193,17 +36297,17 @@ var init_chokidar = __esm({
           return this;
         const paths = unifyPaths(paths_);
         const { cwd } = this.options;
-        paths.forEach((path33) => {
-          if (!sp2.isAbsolute(path33) && !this._closers.has(path33)) {
+        paths.forEach((path34) => {
+          if (!sysPath2.isAbsolute(path34) && !this._closers.has(path34)) {
             if (cwd)
-              path33 = sp2.join(cwd, path33);
-            path33 = sp2.resolve(path33);
+              path34 = sysPath2.join(cwd, path34);
+            path34 = sysPath2.resolve(path34);
           }
-          this._closePath(path33);
-          this._addIgnoredPath(path33);
-          if (this._watched.has(path33)) {
+          this._closePath(path34);
+          this._addIgnoredPath(path34);
+          if (this._watched.has(path34)) {
             this._addIgnoredPath({
-              path: path33,
+              path: path34,
               recursive: true
             });
           }
@@ -36246,7 +36350,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();
         });
@@ -36267,38 +36371,38 @@ var init_chokidar = __esm({
        * @param stats arguments to be passed with event
        * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
        */
-      async _emit(event, path33, stats) {
+      async _emit(event, path34, stats) {
         if (this.closed)
           return;
         const opts = this.options;
         if (isWindows)
-          path33 = sp2.normalize(path33);
+          path34 = sysPath2.normalize(path34);
         if (opts.cwd)
-          path33 = sp2.relative(opts.cwd, path33);
-        const args = [path33];
+          path34 = sysPath2.relative(opts.cwd, path34);
+        const args = [path34];
         if (stats != null)
           args.push(stats);
         const awf = opts.awaitWriteFinish;
         let pw;
-        if (awf && (pw = this._pendingWrites.get(path33))) {
+        if (awf && (pw = this._pendingWrites.get(path34))) {
           pw.lastChange = /* @__PURE__ */ new Date();
           return this;
         }
         if (opts.atomic) {
           if (event === EVENTS.UNLINK) {
-            this._pendingUnlinks.set(path33, [event, ...args]);
+            this._pendingUnlinks.set(path34, [event, ...args]);
             setTimeout(() => {
-              this._pendingUnlinks.forEach((entry, path34) => {
+              this._pendingUnlinks.forEach((entry, path35) => {
                 this.emit(...entry);
                 this.emit(EVENTS.ALL, ...entry);
-                this._pendingUnlinks.delete(path34);
+                this._pendingUnlinks.delete(path35);
               });
             }, typeof opts.atomic === "number" ? opts.atomic : 100);
             return this;
           }
-          if (event === EVENTS.ADD && this._pendingUnlinks.has(path33)) {
+          if (event === EVENTS.ADD && this._pendingUnlinks.has(path34)) {
             event = EVENTS.CHANGE;
-            this._pendingUnlinks.delete(path33);
+            this._pendingUnlinks.delete(path34);
           }
         }
         if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -36316,19 +36420,19 @@ var init_chokidar = __esm({
               this.emitWithAll(event, args);
             }
           };
-          this._awaitWriteFinish(path33, awf.stabilityThreshold, event, awfEmit);
+          this._awaitWriteFinish(path34, awf.stabilityThreshold, event, awfEmit);
           return this;
         }
         if (event === EVENTS.CHANGE) {
-          const isThrottled = !this._throttle(EVENTS.CHANGE, path33, 50);
+          const isThrottled = !this._throttle(EVENTS.CHANGE, path34, 50);
           if (isThrottled)
             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, path34) : path34;
           let stats2;
           try {
-            stats2 = await (0, import_promises5.stat)(fullPath);
+            stats2 = await (0, import_promises6.stat)(fullPath);
           } catch (err) {
           }
           if (!stats2 || this.closed)
@@ -36356,23 +36460,23 @@ var init_chokidar = __esm({
        * @param timeout duration of time to suppress duplicate actions
        * @returns tracking object or false if action should be suppressed
        */
-      _throttle(actionType, path33, timeout) {
+      _throttle(actionType, path34, timeout) {
         if (!this._throttled.has(actionType)) {
           this._throttled.set(actionType, /* @__PURE__ */ new Map());
         }
         const action = this._throttled.get(actionType);
         if (!action)
           throw new Error("invalid throttle");
-        const actionPath = action.get(path33);
+        const actionPath = action.get(path34);
         if (actionPath) {
           actionPath.count++;
           return false;
         }
         let timeoutObject;
         const clear = () => {
-          const item = action.get(path33);
+          const item = action.get(path34);
           const count = item ? item.count : 0;
-          action.delete(path33);
+          action.delete(path34);
           clearTimeout(timeoutObject);
           if (item)
             clearTimeout(item.timeoutObject);
@@ -36380,7 +36484,7 @@ var init_chokidar = __esm({
         };
         timeoutObject = setTimeout(clear, timeout);
         const thr = { timeoutObject, clear, count: 0 };
-        action.set(path33, thr);
+        action.set(path34, thr);
         return thr;
       }
       _incrReadyCount() {
@@ -36394,44 +36498,44 @@ var init_chokidar = __esm({
        * @param event
        * @param awfEmit Callback to be called when ready for event to be emitted.
        */
-      _awaitWriteFinish(path33, threshold, event, awfEmit) {
+      _awaitWriteFinish(path34, threshold, event, awfEmit) {
         const awf = this.options.awaitWriteFinish;
         if (typeof awf !== "object")
           return;
         const pollInterval = awf.pollInterval;
         let timeoutHandler;
-        let fullPath = path33;
-        if (this.options.cwd && !sp2.isAbsolute(path33)) {
-          fullPath = sp2.join(this.options.cwd, path33);
+        let fullPath = path34;
+        if (this.options.cwd && !sysPath2.isAbsolute(path34)) {
+          fullPath = sysPath2.join(this.options.cwd, path34);
         }
         const now = /* @__PURE__ */ new Date();
         const writes = this._pendingWrites;
         function awaitWriteFinishFn(prevStat) {
-          (0, import_node_fs3.stat)(fullPath, (err, curStat) => {
-            if (err || !writes.has(path33)) {
+          (0, import_fs8.stat)(fullPath, (err, curStat) => {
+            if (err || !writes.has(path34)) {
               if (err && err.code !== "ENOENT")
                 awfEmit(err);
               return;
             }
             const now2 = Number(/* @__PURE__ */ new Date());
             if (prevStat && curStat.size !== prevStat.size) {
-              writes.get(path33).lastChange = now2;
+              writes.get(path34).lastChange = now2;
             }
-            const pw = writes.get(path33);
+            const pw = writes.get(path34);
             const df = now2 - pw.lastChange;
             if (df >= threshold) {
-              writes.delete(path33);
+              writes.delete(path34);
               awfEmit(void 0, curStat);
             } else {
               timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
             }
           });
         }
-        if (!writes.has(path33)) {
-          writes.set(path33, {
+        if (!writes.has(path34)) {
+          writes.set(path34, {
             lastChange: now,
             cancelWait: () => {
-              writes.delete(path33);
+              writes.delete(path34);
               clearTimeout(timeoutHandler);
               return event;
             }
@@ -36442,8 +36546,8 @@ var init_chokidar = __esm({
       /**
        * Determines whether user has asked to ignore this path.
        */
-      _isIgnored(path33, stats) {
-        if (this.options.atomic && DOT_RE.test(path33))
+      _isIgnored(path34, stats) {
+        if (this.options.atomic && DOT_RE.test(path34))
           return true;
         if (!this._userIgnored) {
           const { cwd } = this.options;
@@ -36453,17 +36557,17 @@ var init_chokidar = __esm({
           const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
           this._userIgnored = anymatch(list, void 0);
         }
-        return this._userIgnored(path33, stats);
+        return this._userIgnored(path34, stats);
       }
-      _isntIgnored(path33, stat5) {
-        return !this._isIgnored(path33, stat5);
+      _isntIgnored(path34, stat5) {
+        return !this._isIgnored(path34, stat5);
       }
       /**
        * Provides a set of common helpers and properties relating to symlink handling.
        * @param path file or directory pattern being watched
        */
-      _getWatchHelpers(path33) {
-        return new WatchHelper(path33, this.options.followSymlinks, this);
+      _getWatchHelpers(path34) {
+        return new WatchHelper(path34, this.options.followSymlinks, this);
       }
       // Directory helpers
       // -----------------
@@ -36472,7 +36576,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);
@@ -36495,63 +36599,63 @@ 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);
-        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path33) || this._watched.has(fullPath);
-        if (!this._throttle("remove", path33, 100))
+        const path34 = sysPath2.join(directory, item);
+        const fullPath = sysPath2.resolve(path34);
+        isDirectory = isDirectory != null ? isDirectory : this._watched.has(path34) || this._watched.has(fullPath);
+        if (!this._throttle("remove", path34, 100))
           return;
         if (!isDirectory && this._watched.size === 1) {
           this.add(directory, item, true);
         }
-        const wp = this._getWatchedDir(path33);
+        const wp = this._getWatchedDir(path34);
         const nestedDirectoryChildren = wp.getChildren();
-        nestedDirectoryChildren.forEach((nested) => this._remove(path33, nested));
+        nestedDirectoryChildren.forEach((nested) => this._remove(path34, nested));
         const parent = this._getWatchedDir(directory);
         const wasTracked = parent.has(item);
         parent.remove(item);
         if (this._symlinkPaths.has(fullPath)) {
           this._symlinkPaths.delete(fullPath);
         }
-        let relPath = path33;
+        let relPath = path34;
         if (this.options.cwd)
-          relPath = sp2.relative(this.options.cwd, path33);
+          relPath = sysPath2.relative(this.options.cwd, path34);
         if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
           const event = this._pendingWrites.get(relPath).cancelWait();
           if (event === EVENTS.ADD)
             return;
         }
-        this._watched.delete(path33);
+        this._watched.delete(path34);
         this._watched.delete(fullPath);
         const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-        if (wasTracked && !this._isIgnored(path33))
-          this._emit(eventName, path33);
-        this._closePath(path33);
+        if (wasTracked && !this._isIgnored(path34))
+          this._emit(eventName, path34);
+        this._closePath(path34);
       }
       /**
        * Closes all watchers for a path
        */
-      _closePath(path33) {
-        this._closeFile(path33);
-        const dir = sp2.dirname(path33);
-        this._getWatchedDir(dir).remove(sp2.basename(path33));
+      _closePath(path34) {
+        this._closeFile(path34);
+        const dir = sysPath2.dirname(path34);
+        this._getWatchedDir(dir).remove(sysPath2.basename(path34));
       }
       /**
        * Closes only file-specific watchers
        */
-      _closeFile(path33) {
-        const closers = this._closers.get(path33);
+      _closeFile(path34) {
+        const closers = this._closers.get(path34);
         if (!closers)
           return;
         closers.forEach((closer) => closer());
-        this._closers.delete(path33);
+        this._closers.delete(path34);
       }
-      _addPathCloser(path33, closer) {
+      _addPathCloser(path34, closer) {
         if (!closer)
           return;
-        let list = this._closers.get(path33);
+        let list = this._closers.get(path34);
         if (!list) {
           list = [];
-          this._closers.set(path33, list);
+          this._closers.set(path34, list);
         }
         list.push(closer);
       }
@@ -36871,14 +36975,14 @@ var init_provider_schema = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/providers/provider-loader.ts
-var fs7, path17, os16, ProviderLoader;
+var fs7, path18, os16, ProviderLoader;
 var init_provider_loader = __esm({
   "../../oss/packages/daemon-core/src/providers/provider-loader.ts"() {
     "use strict";
     fs7 = __toESM(require("fs"));
-    path17 = __toESM(require("path"));
+    path18 = __toESM(require("path"));
     os16 = __toESM(require("os"));
-    init_chokidar();
+    init_esm2();
     init_ide_detector();
     init_logger();
     init_provider_schema();
@@ -36913,7 +37017,7 @@ var init_provider_loader = __esm({
         try {
           if (!fs7.existsSync(candidate) || !fs7.statSync(candidate).isDirectory()) return false;
           return ["ide", "extension", "cli", "acp"].some(
-            (category) => fs7.existsSync(path17.join(candidate, category))
+            (category) => fs7.existsSync(path18.join(candidate, category))
           );
         } catch {
           return false;
@@ -36921,20 +37025,20 @@ var init_provider_loader = __esm({
       }
       static hasProviderRootMarker(candidate) {
         try {
-          return fs7.existsSync(path17.join(candidate, _ProviderLoader.SIBLING_MARKER_FILE));
+          return fs7.existsSync(path18.join(candidate, _ProviderLoader.SIBLING_MARKER_FILE));
         } catch {
           return false;
         }
       }
       detectDefaultUserDir() {
-        const fallback2 = path17.join(os16.homedir(), ".adhdev", "providers");
+        const fallback2 = path18.join(os16.homedir(), ".adhdev", "providers");
         const envOptIn = process.env[_ProviderLoader.SIBLING_ENV_VAR] === "1";
         const visited = /* @__PURE__ */ new Set();
         for (const start of this.probeStarts) {
-          let current = path17.resolve(start);
+          let current = path18.resolve(start);
           while (!visited.has(current)) {
             visited.add(current);
-            const siblingCandidate = path17.join(path17.dirname(current), _ProviderLoader.REPO_PROVIDER_DIRNAME);
+            const siblingCandidate = path18.join(path18.dirname(current), _ProviderLoader.REPO_PROVIDER_DIRNAME);
             if (_ProviderLoader.looksLikeProviderRoot(siblingCandidate)) {
               const hasMarker = _ProviderLoader.hasProviderRootMarker(siblingCandidate);
               if (envOptIn || hasMarker) {
@@ -36956,7 +37060,7 @@ var init_provider_loader = __esm({
                 return { path: siblingCandidate, source };
               }
             }
-            const parent = path17.dirname(current);
+            const parent = path18.dirname(current);
             if (parent === current) break;
             current = parent;
           }
@@ -36966,11 +37070,11 @@ var init_provider_loader = __esm({
       constructor(options) {
         this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
         this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
-        this.defaultProvidersDir = path17.join(os16.homedir(), ".adhdev", "providers");
+        this.defaultProvidersDir = path18.join(os16.homedir(), ".adhdev", "providers");
         const detected = this.detectDefaultUserDir();
         this.userDir = detected.path;
         this.userDirSource = detected.source;
-        this.upstreamDir = path17.join(this.defaultProvidersDir, ".upstream");
+        this.upstreamDir = path18.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = false;
         this.applySourceConfig({
           userDir: options?.userDir,
@@ -37029,7 +37133,7 @@ var init_provider_loader = __esm({
           this.userDir = detected.path;
           this.userDirSource = detected.source;
         }
-        this.upstreamDir = path17.join(this.defaultProvidersDir, ".upstream");
+        this.upstreamDir = path18.join(this.defaultProvidersDir, ".upstream");
         this.disableUpstream = this.sourceMode === "no-upstream";
         if (this.explicitProviderDir) {
           this.log(`Config 'providerDir' applied: ${this.userDir}`);
@@ -37043,7 +37147,7 @@ var init_provider_loader = __esm({
       * Canonical provider directory shape for a given root.
       */
       getProviderDir(root, category, type) {
-        return path17.join(root, category, type);
+        return path18.join(root, category, type);
       }
       /**
       * Canonical user override directory for a provider.
@@ -37070,7 +37174,7 @@ var init_provider_loader = __esm({
       resolveProviderFile(type, ...segments) {
         const dir = this.findProviderDirInternal(type);
         if (!dir) return null;
-        return path17.join(dir, ...segments);
+        return path18.join(dir, ...segments);
       }
       /**
       * Load all providers (3-tier priority)
@@ -37109,7 +37213,7 @@ var init_provider_loader = __esm({
         if (!fs7.existsSync(this.upstreamDir)) return false;
         try {
           return fs7.readdirSync(this.upstreamDir).some(
-            (d) => fs7.statSync(path17.join(this.upstreamDir, d)).isDirectory()
+            (d) => fs7.statSync(path18.join(this.upstreamDir, d)).isDirectory()
           );
         } catch {
           return false;
@@ -37606,8 +37710,8 @@ var init_provider_loader = __esm({
                   resolved._resolvedScriptDir = entry.scriptDir;
                   resolved._resolvedScriptsSource = `compatibility:${entry.ideVersion}`;
                   if (providerDir) {
-                    const fullDir = path17.join(providerDir, entry.scriptDir);
-                    resolved._resolvedScriptsPath = fs7.existsSync(path17.join(fullDir, "scripts.js")) ? path17.join(fullDir, "scripts.js") : fullDir;
+                    const fullDir = path18.join(providerDir, entry.scriptDir);
+                    resolved._resolvedScriptsPath = fs7.existsSync(path18.join(fullDir, "scripts.js")) ? path18.join(fullDir, "scripts.js") : fullDir;
                   }
                   matched = true;
                 }
@@ -37622,8 +37726,8 @@ var init_provider_loader = __esm({
                 resolved._resolvedScriptDir = base.defaultScriptDir;
                 resolved._resolvedScriptsSource = "defaultScriptDir:version_miss";
                 if (providerDir) {
-                  const fullDir = path17.join(providerDir, base.defaultScriptDir);
-                  resolved._resolvedScriptsPath = fs7.existsSync(path17.join(fullDir, "scripts.js")) ? path17.join(fullDir, "scripts.js") : fullDir;
+                  const fullDir = path18.join(providerDir, base.defaultScriptDir);
+                  resolved._resolvedScriptsPath = fs7.existsSync(path18.join(fullDir, "scripts.js")) ? path18.join(fullDir, "scripts.js") : fullDir;
                 }
               }
               resolved._versionWarning = `Version ${currentVersion} not in compatibility matrix. Using default scripts.`;
@@ -37640,8 +37744,8 @@ var init_provider_loader = __esm({
                   resolved._resolvedScriptDir = dirOverride;
                   resolved._resolvedScriptsSource = `versions:${range}`;
                   if (providerDir) {
-                    const fullDir = path17.join(providerDir, dirOverride);
-                    resolved._resolvedScriptsPath = fs7.existsSync(path17.join(fullDir, "scripts.js")) ? path17.join(fullDir, "scripts.js") : fullDir;
+                    const fullDir = path18.join(providerDir, dirOverride);
+                    resolved._resolvedScriptsPath = fs7.existsSync(path18.join(fullDir, "scripts.js")) ? path18.join(fullDir, "scripts.js") : fullDir;
                   }
                 }
               } else if (override.scripts) {
@@ -37657,8 +37761,8 @@ var init_provider_loader = __esm({
             resolved._resolvedScriptDir = base.defaultScriptDir;
             resolved._resolvedScriptsSource = "defaultScriptDir:no_version";
             if (providerDir) {
-              const fullDir = path17.join(providerDir, base.defaultScriptDir);
-              resolved._resolvedScriptsPath = fs7.existsSync(path17.join(fullDir, "scripts.js")) ? path17.join(fullDir, "scripts.js") : fullDir;
+              const fullDir = path18.join(providerDir, base.defaultScriptDir);
+              resolved._resolvedScriptsPath = fs7.existsSync(path18.join(fullDir, "scripts.js")) ? path18.join(fullDir, "scripts.js") : fullDir;
             }
           }
         }
@@ -37690,14 +37794,14 @@ var init_provider_loader = __esm({
           this.log(`  [loadScriptsFromDir] ${type}: providerDir not found`);
           return null;
         }
-        const dir = path17.join(providerDir, scriptDir);
+        const dir = path18.join(providerDir, scriptDir);
         if (!fs7.existsSync(dir)) {
           this.log(`  [loadScriptsFromDir] ${type}: dir not found: ${dir}`);
           return null;
         }
         const cached2 = this.scriptsCache.get(dir);
         if (cached2) return cached2;
-        const scriptsJs = path17.join(dir, "scripts.js");
+        const scriptsJs = path18.join(dir, "scripts.js");
         if (fs7.existsSync(scriptsJs)) {
           try {
             delete require.cache[require.resolve(scriptsJs)];
@@ -37739,7 +37843,7 @@ var init_provider_loader = __esm({
                 return;
               }
               if (filePath.endsWith(".js") || filePath.endsWith(".json")) {
-                this.log(`File changed: ${path17.basename(filePath)}, reloading...`);
+                this.log(`File changed: ${path18.basename(filePath)}, reloading...`);
                 this.reload();
               }
             };
@@ -37794,7 +37898,7 @@ var init_provider_loader = __esm({
         }
         const https = require("https");
         const { execSync: execSync7 } = require("child_process");
-        const metaPath = path17.join(this.upstreamDir, _ProviderLoader.META_FILE);
+        const metaPath = path18.join(this.upstreamDir, _ProviderLoader.META_FILE);
         let prevEtag = "";
         let prevTimestamp = 0;
         try {
@@ -37854,17 +37958,17 @@ var init_provider_loader = __esm({
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path17.join(os16.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path17.join(os16.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path18.join(os16.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path18.join(os16.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
           fs7.mkdirSync(tmpExtract, { recursive: true });
           execSync7(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
           const extracted = fs7.readdirSync(tmpExtract);
           const rootDir = extracted.find(
-            (d) => fs7.statSync(path17.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
+            (d) => fs7.statSync(path18.join(tmpExtract, d)).isDirectory() && d.startsWith("adhdev-providers")
           );
           if (!rootDir) throw new Error("Unexpected tarball structure");
-          const sourceDir = path17.join(tmpExtract, rootDir);
+          const sourceDir = path18.join(tmpExtract, rootDir);
           const backupDir = this.upstreamDir + ".bak";
           if (fs7.existsSync(this.upstreamDir)) {
             if (fs7.existsSync(backupDir)) fs7.rmSync(backupDir, { recursive: true, force: true });
@@ -37939,8 +38043,8 @@ var init_provider_loader = __esm({
       copyDirRecursive(src, dest) {
         fs7.mkdirSync(dest, { recursive: true });
         for (const entry of fs7.readdirSync(src, { withFileTypes: true })) {
-          const srcPath = path17.join(src, entry.name);
-          const destPath = path17.join(dest, entry.name);
+          const srcPath = path18.join(src, entry.name);
+          const destPath = path18.join(dest, entry.name);
           if (entry.isDirectory()) {
             this.copyDirRecursive(srcPath, destPath);
           } else {
@@ -37951,7 +38055,7 @@ var init_provider_loader = __esm({
       /** .meta.json save */
       writeMeta(metaPath, etag, timestamp) {
         try {
-          fs7.mkdirSync(path17.dirname(metaPath), { recursive: true });
+          fs7.mkdirSync(path18.dirname(metaPath), { recursive: true });
           fs7.writeFileSync(metaPath, JSON.stringify({
             etag,
             timestamp,
@@ -37968,7 +38072,7 @@ var init_provider_loader = __esm({
         const scan = (d) => {
           try {
             for (const entry of fs7.readdirSync(d, { withFileTypes: true })) {
-              if (entry.isDirectory()) scan(path17.join(d, entry.name));
+              if (entry.isDirectory()) scan(path18.join(d, entry.name));
               else if (entry.name === "provider.json") count++;
             }
           } catch {
@@ -38196,17 +38300,17 @@ var init_provider_loader = __esm({
         for (const root of searchRoots) {
           if (!fs7.existsSync(root)) continue;
           const candidate = this.getProviderDir(root, cat, type);
-          if (fs7.existsSync(path17.join(candidate, "provider.json"))) return candidate;
-          const catDir = path17.join(root, cat);
+          if (fs7.existsSync(path18.join(candidate, "provider.json"))) return candidate;
+          const catDir = path18.join(root, cat);
           if (fs7.existsSync(catDir)) {
             try {
               for (const entry of fs7.readdirSync(catDir, { withFileTypes: true })) {
                 if (!entry.isDirectory()) continue;
-                const jsonPath = path17.join(catDir, entry.name, "provider.json");
+                const jsonPath = path18.join(catDir, entry.name, "provider.json");
                 if (fs7.existsSync(jsonPath)) {
                   try {
                     const data = JSON.parse(fs7.readFileSync(jsonPath, "utf-8"));
-                    if (data.type === type) return path17.join(catDir, entry.name);
+                    if (data.type === type) return path18.join(catDir, entry.name);
                   } catch {
                   }
                 }
@@ -38223,7 +38327,7 @@ var init_provider_loader = __esm({
        * (template substitution is NOT applied here — scripts.js handles that)
        */
       buildScriptWrappersFromDir(dir) {
-        const scriptsJs = path17.join(dir, "scripts.js");
+        const scriptsJs = path18.join(dir, "scripts.js");
         if (fs7.existsSync(scriptsJs)) {
           try {
             delete require.cache[require.resolve(scriptsJs)];
@@ -38237,7 +38341,7 @@ var init_provider_loader = __esm({
           for (const file2 of fs7.readdirSync(dir)) {
             if (!file2.endsWith(".js")) continue;
             const scriptName = toCamel(file2.replace(".js", ""));
-            const filePath = path17.join(dir, file2);
+            const filePath = path18.join(dir, file2);
             result[scriptName] = (...args) => {
               try {
                 let content = fs7.readFileSync(filePath, "utf-8");
@@ -38297,7 +38401,7 @@ var init_provider_loader = __esm({
           }
           const hasJson = entries.some((e) => e.name === "provider.json");
           if (hasJson) {
-            const jsonPath = path17.join(d, "provider.json");
+            const jsonPath = path18.join(d, "provider.json");
             try {
               const raw = fs7.readFileSync(jsonPath, "utf-8");
               const mod = JSON.parse(raw);
@@ -38318,7 +38422,7 @@ var init_provider_loader = __esm({
                 this.log(`\u26A0 Invalid provider at ${jsonPath}: ${validation.errors.join("; ")}`);
               } else {
                 const hasCompatibility = Array.isArray(normalizedProvider.compatibility);
-                const scriptsPath = path17.join(d, "scripts.js");
+                const scriptsPath = path18.join(d, "scripts.js");
                 if (!hasCompatibility && fs7.existsSync(scriptsPath)) {
                   try {
                     delete require.cache[require.resolve(scriptsPath)];
@@ -38344,7 +38448,7 @@ var init_provider_loader = __esm({
               if (!entry.isDirectory()) continue;
               if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
               if (excludeDirs && d === dir && excludeDirs.includes(entry.name)) continue;
-              scan(path17.join(d, entry.name));
+              scan(path18.join(d, entry.name));
             }
           }
         };
@@ -38675,8 +38779,8 @@ function detectCurrentWorkspace(ideId) {
       const appNameMap = getMacAppIdentifiers();
       const appName = appNameMap[ideId];
       if (appName) {
-        const storagePath = path18.join(
-          process.env.APPDATA || path18.join(os17.homedir(), "AppData", "Roaming"),
+        const storagePath = path19.join(
+          process.env.APPDATA || path19.join(os17.homedir(), "AppData", "Roaming"),
           appName,
           "storage.json"
         );
@@ -38858,14 +38962,14 @@ async function launchLinux(ide, port, workspace, newWindow) {
 function getAvailableIdeIds() {
   return getProviderLoader().getAvailableIdeTypes();
 }
-var import_child_process7, net2, os17, path18, _providerLoader;
+var import_child_process7, net2, os17, path19, _providerLoader;
 var init_launch = __esm({
   "../../oss/packages/daemon-core/src/launch.ts"() {
     "use strict";
     import_child_process7 = require("child_process");
     net2 = __toESM(require("net"));
     os17 = __toESM(require("os"));
-    path18 = __toESM(require("path"));
+    path19 = __toESM(require("path"));
     init_ide_detector();
     init_provider_loader();
     init_macos_app_process();
@@ -38897,7 +39001,7 @@ function checkRotation() {
   const today = getDateStr2();
   if (today !== currentDate2) {
     currentDate2 = today;
-    currentFile = path19.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path20.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     cleanOldFiles();
   }
 }
@@ -38911,7 +39015,7 @@ function cleanOldFiles() {
       const dateMatch = file2.match(/commands-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs8.unlinkSync(path19.join(LOG_DIR2, file2));
+          fs8.unlinkSync(path20.join(LOG_DIR2, file2));
         } catch {
         }
       }
@@ -38983,14 +39087,14 @@ function getRecentCommands(count = 50) {
     return [];
   }
 }
-var fs8, path19, os18, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
+var fs8, path20, os18, LOG_DIR2, MAX_FILE_SIZE, MAX_DAYS, SENSITIVE_KEYS, currentDate2, currentFile, writeCount2, SKIP_COMMANDS;
 var init_command_log = __esm({
   "../../oss/packages/daemon-core/src/logging/command-log.ts"() {
     "use strict";
     fs8 = __toESM(require("fs"));
-    path19 = __toESM(require("path"));
+    path20 = __toESM(require("path"));
     os18 = __toESM(require("os"));
-    LOG_DIR2 = process.platform === "win32" ? path19.join(process.env.LOCALAPPDATA || process.env.APPDATA || path19.join(os18.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path19.join(os18.homedir(), "Library", "Logs", "adhdev") : path19.join(os18.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR2 = process.platform === "win32" ? path20.join(process.env.LOCALAPPDATA || process.env.APPDATA || path20.join(os18.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path20.join(os18.homedir(), "Library", "Logs", "adhdev") : path20.join(os18.homedir(), ".local", "share", "adhdev", "logs");
     MAX_FILE_SIZE = 5 * 1024 * 1024;
     MAX_DAYS = 7;
     try {
@@ -39009,7 +39113,7 @@ var init_command_log = __esm({
       "text"
     ]);
     currentDate2 = getDateStr2();
-    currentFile = path19.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
+    currentFile = path20.join(LOG_DIR2, `commands-${currentDate2}.jsonl`);
     writeCount2 = 0;
     SKIP_COMMANDS = /* @__PURE__ */ new Set([
       "heartbeat",
@@ -39042,8 +39146,8 @@ function resolveMeshCoordinatorSetup(options) {
   }
   const serverName = mcpConfig.serverName?.trim() || DEFAULT_SERVER_NAME;
   if (mcpConfig.mode === "auto_import") {
-    const path33 = mcpConfig.path?.trim();
-    if (!path33) {
+    const path34 = mcpConfig.path?.trim();
+    if (!path34) {
       return { kind: "unsupported", reason: "Provider auto-import MCP config is missing a config path" };
     }
     const mcpServer = resolveAdhdevMcpServerLaunch({
@@ -39060,7 +39164,7 @@ function resolveMeshCoordinatorSetup(options) {
     return {
       kind: "auto_import",
       serverName,
-      configPath: (0, import_node_path2.join)(workspace, path33),
+      configPath: (0, import_node_path2.join)(workspace, path34),
       configFormat: mcpConfig.format,
       mcpServer
     };
@@ -39099,7 +39203,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) {
@@ -39137,17 +39241,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_fs3.existsSync)(filePath)) return null;
+    return import_node_fs3.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_fs3, 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_fs3 = require("fs");
     import_node_module2 = require("module");
     import_node_path2 = require("path");
     DEFAULT_SERVER_NAME = "adhdev-mesh";
@@ -39484,9 +39588,9 @@ var init_snapshot = __esm({
 // ../../oss/packages/daemon-core/src/commands/upgrade-helper.ts
 function getUpgradeLogPath() {
   const home = os20.homedir();
-  const dir = path20.join(home, ".adhdev");
+  const dir = path21.join(home, ".adhdev");
   fs9.mkdirSync(dir, { recursive: true });
-  return path20.join(dir, "daemon-upgrade.log");
+  return path21.join(dir, "daemon-upgrade.log");
 }
 function appendUpgradeLog(message) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}
@@ -39497,14 +39601,14 @@ function appendUpgradeLog(message) {
   }
 }
 function resolveSiblingNpmInvocation(nodeExecutable, platform12 = process.platform) {
-  const binDir = path20.dirname(nodeExecutable);
+  const binDir = path21.dirname(nodeExecutable);
   if (platform12 === "win32") {
-    const npmCliPath = path20.join(binDir, "node_modules", "npm", "bin", "npm-cli.js");
+    const npmCliPath = path21.join(binDir, "node_modules", "npm", "bin", "npm-cli.js");
     if (fs9.existsSync(npmCliPath)) {
       return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: getNpmExecOptions(platform12) };
     }
     for (const candidate of ["npm.exe", "npm"]) {
-      const candidatePath = path20.join(binDir, candidate);
+      const candidatePath = path21.join(binDir, candidate);
       if (fs9.existsSync(candidatePath)) {
         return { executable: candidatePath, argsPrefix: [], execOptions: getNpmExecOptions(platform12) };
       }
@@ -39512,7 +39616,7 @@ function resolveSiblingNpmInvocation(nodeExecutable, platform12 = process.platfo
     return { executable: nodeExecutable, argsPrefix: [npmCliPath], execOptions: getNpmExecOptions(platform12) };
   }
   for (const candidate of ["npm"]) {
-    const candidatePath = path20.join(binDir, candidate);
+    const candidatePath = path21.join(binDir, candidate);
     if (fs9.existsSync(candidatePath)) {
       return { executable: candidatePath, argsPrefix: [], execOptions: getNpmExecOptions(platform12) };
     }
@@ -39529,13 +39633,13 @@ function findCurrentPackageRoot(currentCliPath, packageName) {
   let currentDir = resolvedPath;
   try {
     if (fs9.statSync(resolvedPath).isFile()) {
-      currentDir = path20.dirname(resolvedPath);
+      currentDir = path21.dirname(resolvedPath);
     }
   } catch {
-    currentDir = path20.dirname(resolvedPath);
+    currentDir = path21.dirname(resolvedPath);
   }
   while (true) {
-    const packageJsonPath = path20.join(currentDir, "package.json");
+    const packageJsonPath = path21.join(currentDir, "package.json");
     try {
       if (fs9.existsSync(packageJsonPath)) {
         const parsed = JSON.parse(fs9.readFileSync(packageJsonPath, "utf8"));
@@ -39546,7 +39650,7 @@ function findCurrentPackageRoot(currentCliPath, packageName) {
       }
     } catch {
     }
-    const parentDir = path20.dirname(currentDir);
+    const parentDir = path21.dirname(currentDir);
     if (parentDir === currentDir) {
       return null;
     }
@@ -39554,13 +39658,13 @@ function findCurrentPackageRoot(currentCliPath, packageName) {
   }
 }
 function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
-  const nodeModulesDir = packageName.startsWith("@") ? path20.dirname(path20.dirname(packageRoot)) : path20.dirname(packageRoot);
-  if (path20.basename(nodeModulesDir) !== "node_modules") {
+  const nodeModulesDir = packageName.startsWith("@") ? path21.dirname(path21.dirname(packageRoot)) : path21.dirname(packageRoot);
+  if (path21.basename(nodeModulesDir) !== "node_modules") {
     return null;
   }
-  const maybeLibDir = path20.dirname(nodeModulesDir);
-  if (path20.basename(maybeLibDir) === "lib") {
-    return path20.dirname(maybeLibDir);
+  const maybeLibDir = path21.dirname(nodeModulesDir);
+  if (path21.basename(maybeLibDir) === "lib") {
+    return path21.dirname(maybeLibDir);
   }
   return maybeLibDir;
 }
@@ -39675,7 +39779,7 @@ async function waitForPidExit(pid, timeoutMs) {
   }
 }
 function stopSessionHostProcesses(appName) {
-  const pidFile = path20.join(os20.homedir(), ".adhdev", `${appName}-session-host.pid`);
+  const pidFile = path21.join(os20.homedir(), ".adhdev", `${appName}-session-host.pid`);
   try {
     if (fs9.existsSync(pidFile)) {
       const pid = Number.parseInt(fs9.readFileSync(pidFile, "utf8").trim(), 10);
@@ -39692,7 +39796,7 @@ function stopSessionHostProcesses(appName) {
   }
 }
 function removeDaemonPidFile() {
-  const pidFile = path20.join(os20.homedir(), ".adhdev", "daemon.pid");
+  const pidFile = path21.join(os20.homedir(), ".adhdev", "daemon.pid");
   try {
     fs9.unlinkSync(pidFile);
   } catch {
@@ -39703,7 +39807,7 @@ function cleanupStaleGlobalInstallDirs(pkgName, surface) {
   const npmRoot = String(execNpmCommandSync(["root", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
   if (!npmRoot) return;
   const npmPrefix = surface.installPrefix || String(execNpmCommandSync(["prefix", "-g", ...prefixArgs], { encoding: "utf8" }, surface)).trim();
-  const binDir = process.platform === "win32" ? npmPrefix : path20.join(npmPrefix, "bin");
+  const binDir = process.platform === "win32" ? npmPrefix : path21.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
   if (pkgName === "@adhdev/daemon-standalone") {
@@ -39711,25 +39815,25 @@ function cleanupStaleGlobalInstallDirs(pkgName, surface) {
   }
   if (pkgName.startsWith("@")) {
     const [scope, name] = pkgName.split("/");
-    const scopeDir = path20.join(npmRoot, scope);
+    const scopeDir = path21.join(npmRoot, scope);
     if (!fs9.existsSync(scopeDir)) return;
     for (const entry of fs9.readdirSync(scopeDir)) {
       if (!entry.startsWith(`.${name}-`)) continue;
-      fs9.rmSync(path20.join(scopeDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale scoped staging dir: ${path20.join(scopeDir, entry)}`);
+      fs9.rmSync(path21.join(scopeDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale scoped staging dir: ${path21.join(scopeDir, entry)}`);
     }
   } else {
     for (const entry of fs9.readdirSync(npmRoot)) {
       if (!entry.startsWith(`.${pkgName}-`)) continue;
-      fs9.rmSync(path20.join(npmRoot, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale staging dir: ${path20.join(npmRoot, entry)}`);
+      fs9.rmSync(path21.join(npmRoot, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale staging dir: ${path21.join(npmRoot, entry)}`);
     }
   }
   if (fs9.existsSync(binDir)) {
     for (const entry of fs9.readdirSync(binDir)) {
       if (!Array.from(binNames).some((name) => entry.startsWith(`.${name}-`))) continue;
-      fs9.rmSync(path20.join(binDir, entry), { recursive: true, force: true });
-      appendUpgradeLog(`Removed stale bin staging entry: ${path20.join(binDir, entry)}`);
+      fs9.rmSync(path21.join(binDir, entry), { recursive: true, force: true });
+      appendUpgradeLog(`Removed stale bin staging entry: ${path21.join(binDir, entry)}`);
     }
   }
 }
@@ -39812,7 +39916,7 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
     process.exit(1);
   }
 }
-var import_child_process8, import_child_process9, fs9, os20, path20, UPGRADE_HELPER_ENV;
+var import_child_process8, import_child_process9, fs9, os20, path21, UPGRADE_HELPER_ENV;
 var init_upgrade_helper = __esm({
   "../../oss/packages/daemon-core/src/commands/upgrade-helper.ts"() {
     "use strict";
@@ -39820,7 +39924,7 @@ var init_upgrade_helper = __esm({
     import_child_process9 = require("child_process");
     fs9 = __toESM(require("fs"));
     os20 = __toESM(require("os"));
-    path20 = __toESM(require("path"));
+    path21 = __toESM(require("path"));
     UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
   }
 });
@@ -39917,7 +40021,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";
@@ -39945,6 +40049,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",
@@ -39962,6 +40070,40 @@ var init_router = __esm({
       constructor(deps) {
         this.deps = deps;
       }
+      getCachedInlineMesh(meshId, inlineMesh) {
+        if (inlineMesh && typeof inlineMesh === "object") {
+          this.inlineMeshCache.set(meshId, inlineMesh);
+          return inlineMesh;
+        }
+        return this.inlineMeshCache.get(meshId);
+      }
+      async getMeshForCommand(meshId, inlineMesh) {
+        try {
+          const { getMesh: getMesh3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+          const mesh = getMesh3(meshId);
+          if (mesh) return { mesh, inline: false };
+        } catch {
+        }
+        const cached2 = this.getCachedInlineMesh(meshId, inlineMesh);
+        return cached2 ? { mesh: cached2, inline: true } : null;
+      }
+      updateInlineMeshNode(meshId, mesh, node) {
+        if (!mesh || !Array.isArray(mesh.nodes) || !node?.id) return;
+        const idx = mesh.nodes.findIndex((entry) => entry?.id === node.id || entry?.nodeId === node.id);
+        if (idx >= 0) mesh.nodes[idx] = node;
+        else mesh.nodes.push(node);
+        mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+        this.inlineMeshCache.set(meshId, mesh);
+      }
+      removeInlineMeshNode(meshId, mesh, nodeId) {
+        if (!mesh || !Array.isArray(mesh.nodes)) return false;
+        const idx = mesh.nodes.findIndex((entry) => entry?.id === nodeId || entry?.nodeId === nodeId);
+        if (idx === -1) return false;
+        mesh.nodes.splice(idx, 1);
+        mesh.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+        this.inlineMeshCache.set(meshId, mesh);
+        return true;
+      }
       async traceSessionHostAction(action, args, run, summarizeResult) {
         const interactionId = typeof args?._interactionId === "string" ? args._interactionId : void 0;
         const sessionId = typeof args?.sessionId === "string" ? args.sessionId : void 0;
@@ -40550,6 +40692,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"], {
@@ -40660,13 +40803,94 @@ var init_router = __esm({
             const nodeId = typeof args?.nodeId === "string" ? args.nodeId.trim() : "";
             if (!meshId || !nodeId) return { success: false, error: "meshId and nodeId required" };
             try {
-              const { removeNode: removeNode3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
-              const removed = removeNode3(meshId, nodeId);
+              const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
+              const mesh = meshRecord?.mesh;
+              const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
+              if (node?.isLocalWorktree && node.workspace) {
+                try {
+                  const sourceNode = node.clonedFromNodeId ? mesh?.nodes.find((n) => n.id === node.clonedFromNodeId || n.nodeId === node.clonedFromNodeId) : mesh?.nodes.find((n) => !n.isLocalWorktree);
+                  const repoRoot = sourceNode?.repoRoot || sourceNode?.workspace;
+                  if (repoRoot) {
+                    const { removeWorktree: removeWorktree2 } = await Promise.resolve().then(() => (init_git_worktree(), git_worktree_exports));
+                    await removeWorktree2(repoRoot, node.workspace);
+                  }
+                } catch (e) {
+                  LOG.warn("MeshNode", `Worktree cleanup failed for ${nodeId}: ${e.message}`);
+                }
+              }
+              let removed = false;
+              if (meshRecord?.inline) {
+                removed = this.removeInlineMeshNode(meshId, mesh, nodeId);
+              } else {
+                const { removeNode: removeNode3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+                removed = removeNode3(meshId, nodeId);
+              }
               return { success: true, removed };
             } catch (e) {
               return { success: false, error: e.message };
             }
           }
+          case "clone_mesh_node": {
+            const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+            const sourceNodeId = typeof args?.sourceNodeId === "string" ? args.sourceNodeId.trim() : "";
+            const branch = typeof args?.branch === "string" ? args.branch.trim() : "";
+            const baseBranch = typeof args?.baseBranch === "string" ? args.baseBranch.trim() : void 0;
+            if (!meshId) return { success: false, error: "meshId required" };
+            if (!sourceNodeId) return { success: false, error: "sourceNodeId required" };
+            if (!branch) return { success: false, error: "branch required" };
+            try {
+              const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
+              const mesh = meshRecord?.mesh;
+              if (!mesh) return { success: false, error: "Mesh not found" };
+              const sourceNode = mesh.nodes?.find((n) => n.id === sourceNodeId || n.nodeId === sourceNodeId);
+              if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
+              const repoRoot = sourceNode.repoRoot || sourceNode.workspace;
+              const { createWorktree: createWorktree2 } = await Promise.resolve().then(() => (init_git_worktree(), git_worktree_exports));
+              const result = await createWorktree2({
+                repoRoot,
+                branch,
+                baseBranch,
+                meshName: mesh.name
+              });
+              let node;
+              if (meshRecord.inline) {
+                const { randomUUID: randomUUID9 } = await import("crypto");
+                node = {
+                  id: `node_${randomUUID9().replace(/-/g, "")}`,
+                  workspace: result.worktreePath,
+                  repoRoot: result.worktreePath,
+                  daemonId: sourceNode.daemonId,
+                  userOverrides: { ...sourceNode.userOverrides || {} },
+                  policy: { ...sourceNode.policy || {} },
+                  isLocalWorktree: true,
+                  worktreeBranch: result.branch,
+                  clonedFromNodeId: sourceNodeId
+                };
+                this.updateInlineMeshNode(meshId, mesh, node);
+              } else {
+                const { addNode: addNode3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+                node = addNode3(meshId, {
+                  workspace: result.worktreePath,
+                  repoRoot: result.worktreePath,
+                  daemonId: sourceNode.daemonId,
+                  userOverrides: { ...sourceNode.userOverrides || {} },
+                  isLocalWorktree: true,
+                  worktreeBranch: result.branch,
+                  clonedFromNodeId: sourceNodeId,
+                  policy: { ...sourceNode.policy || {} }
+                });
+                if (!node) return { success: false, error: "Failed to register worktree node" };
+              }
+              return {
+                success: true,
+                node,
+                worktreePath: result.worktreePath,
+                branch: result.branch
+              };
+            } catch (e) {
+              return { success: false, error: e.message };
+            }
+          }
           // ─── Mesh Coordinator Launch ───
           case "launch_mesh_coordinator": {
             const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
@@ -40735,9 +40959,24 @@ var init_router = __esm({
                   workspace
                 };
               }
-              const { existsSync: existsSync26, readFileSync: readFileSync20, writeFileSync: writeFileSync14, copyFileSync: copyFileSync4 } = await import("fs");
+              let systemPrompt = "";
+              try {
+                systemPrompt = buildCoordinatorSystemPrompt2({ mesh, coordinatorCliType: cliType });
+              } catch (error48) {
+                const message = error48?.message || String(error48);
+                LOG.error("MeshCoordinator", `Failed to build coordinator prompt: ${message}`);
+                return {
+                  success: false,
+                  code: "mesh_coordinator_prompt_failed",
+                  error: `Failed to build Repo Mesh coordinator prompt: ${message}`,
+                  meshId,
+                  cliType,
+                  workspace
+                };
+              }
+              const { existsSync: existsSync27, readFileSync: readFileSync20, writeFileSync: writeFileSync14, copyFileSync: copyFileSync4 } = await import("fs");
               const mcpConfigPath = coordinatorSetup.configPath;
-              const hadExistingMcpConfig = existsSync26(mcpConfigPath);
+              const hadExistingMcpConfig = existsSync27(mcpConfigPath);
               let existingMcpConfig = {};
               if (hadExistingMcpConfig) {
                 try {
@@ -40752,7 +40991,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 = {
@@ -40764,12 +41004,6 @@ var init_router = __esm({
               };
               writeFileSync14(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf-8");
               LOG.info("MeshCoordinator", `Wrote ${mcpConfigPath} with ${coordinatorSetup.serverName} server`);
-              let systemPrompt = "";
-              try {
-                systemPrompt = buildCoordinatorSystemPrompt2({ mesh });
-              } catch {
-                systemPrompt = `You are a Repo Mesh Coordinator for "${mesh.name}". Use the adhdev-mesh MCP tools (mesh_status, mesh_list_nodes, mesh_send_task, mesh_read_chat, mesh_launch_session, etc.) to orchestrate work across ${mesh.nodes.length} node(s).`;
-              }
               const cliArgs = [];
               if (systemPrompt) {
                 cliArgs.push("--append-system-prompt", systemPrompt);
@@ -42532,7 +42766,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;
 }
@@ -42571,7 +42805,7 @@ function checkPathExists2(paths) {
   for (const p of paths) {
     if (p.includes("*")) {
       const home = os21.homedir();
-      const resolved = p.replace(/\*/g, home.split(path21.sep).pop() || "");
+      const resolved = p.replace(/\*/g, home.split(path23.sep).pop() || "");
       if (fs11.existsSync(resolved)) return resolved;
     } else {
       if (fs11.existsSync(p)) return p;
@@ -42580,15 +42814,15 @@ function checkPathExists2(paths) {
   return null;
 }
 function getMacAppVersion(appPath) {
-  if ((0, import_os3.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
-  const plistPath = path21.join(appPath, "Contents", "Info.plist");
+  if ((0, import_os4.platform)() !== "darwin" || !appPath.endsWith(".app")) return null;
+  const plistPath = path23.join(appPath, "Contents", "Info.plist");
   if (!fs11.existsSync(plistPath)) return null;
   const raw = runCommand(`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" "${plistPath}"`);
   return raw || null;
 }
 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,
@@ -42607,7 +42841,7 @@ async function detectAllVersions(loader, archive) {
       const cliBin = provider.cli ? findBinary2(provider.cli) : null;
       let resolvedBin = cliBin;
       if (!resolvedBin && appPath && currentOs === "darwin") {
-        const bundled = path21.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
+        const bundled = path23.join(appPath, "Contents", "Resources", "app", "bin", provider.cli || "");
         if (provider.cli && fs11.existsSync(bundled)) resolvedBin = bundled;
       }
       info.installed = !!(appPath || resolvedBin);
@@ -42644,16 +42878,16 @@ 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, path23, 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";
     fs11 = __toESM(require("fs"));
-    path21 = __toESM(require("path"));
+    path23 = __toESM(require("path"));
     os21 = __toESM(require("os"));
     import_child_process10 = require("child_process");
-    import_os3 = require("os");
-    ARCHIVE_PATH = path21.join(os21.homedir(), ".adhdev", "version-history.json");
+    import_os4 = require("os");
+    ARCHIVE_PATH = path23.join(os21.homedir(), ".adhdev", "version-history.json");
     MAX_ENTRIES_PER_PROVIDER = 20;
     VersionArchive = class {
       history = {};
@@ -42678,7 +42912,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);
@@ -42700,7 +42934,7 @@ var init_version_archive = __esm({
       }
       save() {
         try {
-          fs11.mkdirSync(path21.dirname(ARCHIVE_PATH), { recursive: true });
+          fs11.mkdirSync(path23.dirname(ARCHIVE_PATH), { recursive: true });
           fs11.writeFileSync(ARCHIVE_PATH, JSON.stringify(this.history, null, 2));
         } catch {
         }
@@ -43235,17 +43469,17 @@ async function handleScriptHints(ctx, type, _req, res) {
     return;
   }
   let scriptsPath = "";
-  const directScripts = path23.join(dir, "scripts.js");
+  const directScripts = path24.join(dir, "scripts.js");
   if (fs12.existsSync(directScripts)) {
     scriptsPath = directScripts;
   } else {
-    const scriptsDir = path23.join(dir, "scripts");
+    const scriptsDir = path24.join(dir, "scripts");
     if (fs12.existsSync(scriptsDir)) {
       const versions = fs12.readdirSync(scriptsDir).filter((d) => {
-        return fs12.statSync(path23.join(scriptsDir, d)).isDirectory();
+        return fs12.statSync(path24.join(scriptsDir, d)).isDirectory();
       }).sort().reverse();
       for (const ver of versions) {
-        const p = path23.join(scriptsDir, ver, "scripts.js");
+        const p = path24.join(scriptsDir, ver, "scripts.js");
         if (fs12.existsSync(p)) {
           scriptsPath = p;
           break;
@@ -44071,12 +44305,12 @@ async function handleDomContext(ctx, type, req, res) {
     ctx.json(res, 500, { error: `DOM context collection failed: ${e.message}` });
   }
 }
-var fs12, path23;
+var fs12, path24;
 var init_dev_cdp_handlers = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cdp-handlers.ts"() {
     "use strict";
     fs12 = __toESM(require("fs"));
-    path23 = __toESM(require("path"));
+    path24 = __toESM(require("path"));
     init_logger();
   }
 });
@@ -44091,11 +44325,11 @@ function getCliFixtureDir(ctx, type) {
   if (!providerDir) {
     throw new Error(`Provider directory not found for '${type}'`);
   }
-  return path24.join(providerDir, "fixtures");
+  return path25.join(providerDir, "fixtures");
 }
 function readCliFixture(ctx, type, name) {
   const fixtureDir = getCliFixtureDir(ctx, type);
-  const filePath = path24.join(fixtureDir, `${name}.json`);
+  const filePath = path25.join(fixtureDir, `${name}.json`);
   if (!fs13.existsSync(filePath)) {
     throw new Error(`Fixture not found: ${filePath}`);
   }
@@ -44862,7 +45096,7 @@ async function handleCliFixtureCapture(ctx, req, res) {
       },
       notes: typeof body?.notes === "string" ? body.notes : void 0
     };
-    const filePath = path24.join(fixtureDir, `${name}.json`);
+    const filePath = path25.join(fixtureDir, `${name}.json`);
     fs13.writeFileSync(filePath, JSON.stringify(fixture, null, 2));
     ctx.json(res, 200, {
       saved: true,
@@ -44886,7 +45120,7 @@ async function handleCliFixtureList(ctx, type, _req, res) {
       return;
     }
     const fixtures = fs13.readdirSync(fixtureDir).filter((file2) => file2.endsWith(".json")).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" })).map((file2) => {
-      const fullPath = path24.join(fixtureDir, file2);
+      const fullPath = path25.join(fixtureDir, file2);
       try {
         const raw = JSON.parse(fs13.readFileSync(fullPath, "utf-8"));
         return {
@@ -45019,12 +45253,12 @@ async function handleCliRaw(ctx, req, res) {
     ctx.json(res, 500, { error: `Raw send failed: ${e.message}` });
   }
 }
-var fs13, path24;
+var fs13, path25;
 var init_dev_cli_debug = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-cli-debug.ts"() {
     "use strict";
     fs13 = __toESM(require("fs"));
-    path24 = __toESM(require("path"));
+    path25 = __toESM(require("path"));
   }
 });
 
@@ -45077,22 +45311,22 @@ function getLatestScriptVersionDir(scriptsDir) {
   if (!fs14.existsSync(scriptsDir)) return null;
   const versions = fs14.readdirSync(scriptsDir).filter((d) => {
     try {
-      return fs14.statSync(path25.join(scriptsDir, d)).isDirectory();
+      return fs14.statSync(path26.join(scriptsDir, d)).isDirectory();
     } catch {
       return false;
     }
   }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
   if (versions.length === 0) return null;
-  return path25.join(scriptsDir, versions[0]);
+  return path26.join(scriptsDir, versions[0]);
 }
 function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
-  const canonicalUserDir = path25.resolve(ctx.providerLoader.getUserProviderDir(category, type));
-  const desiredDir = requestedDir ? path25.resolve(requestedDir) : canonicalUserDir;
-  const upstreamRoot = path25.resolve(ctx.providerLoader.getUpstreamDir());
-  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path25.sep}`)) {
+  const canonicalUserDir = path26.resolve(ctx.providerLoader.getUserProviderDir(category, type));
+  const desiredDir = requestedDir ? path26.resolve(requestedDir) : canonicalUserDir;
+  const upstreamRoot = path26.resolve(ctx.providerLoader.getUpstreamDir());
+  if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path26.sep}`)) {
     return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
   }
-  if (path25.basename(desiredDir) !== type) {
+  if (path26.basename(desiredDir) !== type) {
     return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
   }
   const sourceDir = ctx.findProviderDir(type);
@@ -45100,11 +45334,11 @@ function resolveAutoImplWritableProviderDir(ctx, category, type, requestedDir) {
     return { dir: null, reason: `Provider source directory not found for '${type}'` };
   }
   if (!fs14.existsSync(desiredDir)) {
-    fs14.mkdirSync(path25.dirname(desiredDir), { recursive: true });
+    fs14.mkdirSync(path26.dirname(desiredDir), { recursive: true });
     fs14.cpSync(sourceDir, desiredDir, { recursive: true });
     ctx.log(`Auto-implement writable copy created: ${desiredDir}`);
   }
-  const providerJson = path25.join(desiredDir, "provider.json");
+  const providerJson = path26.join(desiredDir, "provider.json");
   if (!fs14.existsSync(providerJson)) {
     return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
   }
@@ -45115,13 +45349,13 @@ function loadAutoImplReferenceScripts(ctx, referenceType) {
   const refDir = ctx.findProviderDir(referenceType);
   if (!refDir || !fs14.existsSync(refDir)) return {};
   const referenceScripts = {};
-  const scriptsDir = path25.join(refDir, "scripts");
+  const scriptsDir = path26.join(refDir, "scripts");
   const latestDir = getLatestScriptVersionDir(scriptsDir);
   if (!latestDir) return referenceScripts;
   for (const file2 of fs14.readdirSync(latestDir)) {
     if (!file2.endsWith(".js")) continue;
     try {
-      referenceScripts[file2] = fs14.readFileSync(path25.join(latestDir, file2), "utf-8");
+      referenceScripts[file2] = fs14.readFileSync(path26.join(latestDir, file2), "utf-8");
     } catch {
     }
   }
@@ -45229,9 +45463,9 @@ async function handleAutoImplement(ctx, type, req, res) {
     });
     const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
     const prompt2 = buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-    const tmpDir = path25.join(os23.tmpdir(), "adhdev-autoimpl");
+    const tmpDir = path26.join(os23.tmpdir(), "adhdev-autoimpl");
     if (!fs14.existsSync(tmpDir)) fs14.mkdirSync(tmpDir, { recursive: true });
-    const promptFile = path25.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
+    const promptFile = path26.join(tmpDir, `prompt-${type}-${Date.now()}.md`);
     fs14.writeFileSync(promptFile, prompt2, "utf-8");
     ctx.log(`Auto-implement prompt written to ${promptFile} (${prompt2.length} chars)`);
     const agentProvider = ctx.providerLoader.resolve(agent) || ctx.providerLoader.getMeta(agent);
@@ -45663,7 +45897,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     setMode: "set_mode.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path25.join(providerDir, "scripts");
+  const scriptsDir = path26.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -45674,7 +45908,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
     for (const file2 of fs14.readdirSync(latestScriptsDir)) {
       if (file2.endsWith(".js") && targetFileNames.has(file2)) {
         try {
-          const content = fs14.readFileSync(path25.join(latestScriptsDir, file2), "utf-8");
+          const content = fs14.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
           lines.push("```javascript");
           lines.push(content);
@@ -45691,7 +45925,7 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs14.readFileSync(path25.join(latestScriptsDir, file2), "utf-8");
+          const content = fs14.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -45732,10 +45966,10 @@ function buildAutoImplPrompt(ctx, type, provider, providerDir, functions, domCon
       lines.push("");
     }
   }
-  const docsDir = path25.join(providerDir, "../../docs");
+  const docsDir = path26.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path25.join(docsDir, name);
+      const p = path26.join(docsDir, name);
       if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
     } catch {
     }
@@ -45972,7 +46206,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
     parseApproval: "parse_approval.js"
   };
   const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-  const scriptsDir = path25.join(providerDir, "scripts");
+  const scriptsDir = path26.join(providerDir, "scripts");
   const latestScriptsDir = getLatestScriptVersionDir(scriptsDir);
   if (latestScriptsDir) {
     lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -45984,7 +46218,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       if (!file2.endsWith(".js")) continue;
       if (!targetFileNames.has(file2)) continue;
       try {
-        const content = fs14.readFileSync(path25.join(latestScriptsDir, file2), "utf-8");
+        const content = fs14.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
         lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
         lines.push("```javascript");
         lines.push(content);
@@ -46000,7 +46234,7 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
       for (const file2 of refFiles) {
         try {
-          const content = fs14.readFileSync(path25.join(latestScriptsDir, file2), "utf-8");
+          const content = fs14.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
           lines.push(`### \`${file2}\` \u{1F512}`);
           lines.push("```javascript");
           lines.push(content);
@@ -46033,10 +46267,10 @@ function buildCliAutoImplPrompt(ctx, type, provider, providerDir, functions, ref
       lines.push("");
     }
   }
-  const docsDir = path25.join(providerDir, "../../docs");
+  const docsDir = path26.join(providerDir, "../../docs");
   const loadGuide = (name) => {
     try {
-      const p = path25.join(docsDir, name);
+      const p = path26.join(docsDir, name);
       if (fs14.existsSync(p)) return fs14.readFileSync(p, "utf-8");
     } catch {
     }
@@ -46348,12 +46582,12 @@ data: ${JSON.stringify(msg.data)}
     }
   }
 }
-var fs14, path25, os23;
+var fs14, path26, os23;
 var init_dev_auto_implement = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-auto-implement.ts"() {
     "use strict";
     fs14 = __toESM(require("fs"));
-    path25 = __toESM(require("path"));
+    path26 = __toESM(require("path"));
     os23 = __toESM(require("os"));
     init_dev_server();
     init_dev_cli_debug();
@@ -46393,13 +46627,13 @@ function toProviderListEntry(provider) {
   }
   return base;
 }
-var http2, fs15, path26, DEV_SERVER_PORT, DevServer;
+var http2, fs15, path27, DEV_SERVER_PORT, DevServer;
 var init_dev_server = __esm({
   "../../oss/packages/daemon-core/src/daemon/dev-server.ts"() {
     "use strict";
     http2 = __toESM(require("http"));
     fs15 = __toESM(require("fs"));
-    path26 = __toESM(require("path"));
+    path27 = __toESM(require("path"));
     init_provider_schema();
     init_config();
     init_provider_source_config();
@@ -46512,8 +46746,8 @@ var init_dev_server = __esm({
       }
       getEndpointList() {
         return this.routes.map((r) => {
-          const path33 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
-          return `${r.method.padEnd(5)} ${path33}`;
+          const path34 = typeof r.pattern === "string" ? r.pattern : r.pattern.source.replace(/\\\//g, "/").replace(/\(\[.*?\]\+\)/g, ":type").replace(/[\^$]/g, "");
+          return `${r.method.padEnd(5)} ${path34}`;
         });
       }
       async start(port = DEV_SERVER_PORT) {
@@ -46801,12 +47035,12 @@ var init_dev_server = __esm({
       // ─── DevConsole SPA ───
       getConsoleDistDir() {
         const candidates = [
-          path26.resolve(__dirname, "../../web-devconsole/dist"),
-          path26.resolve(__dirname, "../../../web-devconsole/dist"),
-          path26.join(process.cwd(), "packages/web-devconsole/dist")
+          path27.resolve(__dirname, "../../web-devconsole/dist"),
+          path27.resolve(__dirname, "../../../web-devconsole/dist"),
+          path27.join(process.cwd(), "packages/web-devconsole/dist")
         ];
         for (const dir of candidates) {
-          if (fs15.existsSync(path26.join(dir, "index.html"))) return dir;
+          if (fs15.existsSync(path27.join(dir, "index.html"))) return dir;
         }
         return null;
       }
@@ -46816,7 +47050,7 @@ var init_dev_server = __esm({
           this.json(res, 500, { error: "DevConsole not found. Run: npm run build -w packages/web-devconsole" });
           return;
         }
-        const htmlPath = path26.join(distDir, "index.html");
+        const htmlPath = path27.join(distDir, "index.html");
         try {
           const html = fs15.readFileSync(htmlPath, "utf-8");
           res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
@@ -46841,15 +47075,15 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: "Not found" });
           return;
         }
-        const safePath = path26.normalize(pathname).replace(/^\.\.\//, "");
-        const filePath = path26.join(distDir, safePath);
+        const safePath = path27.normalize(pathname).replace(/^\.\.\//, "");
+        const filePath = path27.join(distDir, safePath);
         if (!filePath.startsWith(distDir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
           const content = fs15.readFileSync(filePath);
-          const ext = path26.extname(filePath);
+          const ext = path27.extname(filePath);
           const contentType = _DevServer.MIME_MAP[ext] || "application/octet-stream";
           res.writeHead(200, { "Content-Type": contentType, "Cache-Control": "public, max-age=31536000, immutable" });
           res.end(content);
@@ -46962,9 +47196,9 @@ var init_dev_server = __esm({
               const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
               if (entry.isDirectory()) {
                 files.push({ path: rel, size: 0, type: "dir" });
-                scan(path26.join(d, entry.name), rel);
+                scan(path27.join(d, entry.name), rel);
               } else {
-                const stat5 = fs15.statSync(path26.join(d, entry.name));
+                const stat5 = fs15.statSync(path27.join(d, entry.name));
                 files.push({ path: rel, size: stat5.size, type: "file" });
               }
             }
@@ -46987,7 +47221,7 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path26.resolve(dir, path26.normalize(filePath));
+        const fullPath = path27.resolve(dir, path27.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
@@ -47012,14 +47246,14 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider directory not found: ${type}` });
           return;
         }
-        const fullPath = path26.resolve(dir, path26.normalize(filePath));
+        const fullPath = path27.resolve(dir, path27.normalize(filePath));
         if (!fullPath.startsWith(dir)) {
           this.json(res, 403, { error: "Forbidden" });
           return;
         }
         try {
           if (fs15.existsSync(fullPath)) fs15.copyFileSync(fullPath, fullPath + ".bak");
-          fs15.mkdirSync(path26.dirname(fullPath), { recursive: true });
+          fs15.mkdirSync(path27.dirname(fullPath), { recursive: true });
           fs15.writeFileSync(fullPath, content, "utf-8");
           this.log(`File saved: ${fullPath} (${content.length} chars)`);
           this.providerLoader.reload();
@@ -47036,7 +47270,7 @@ var init_dev_server = __esm({
           return;
         }
         for (const name of ["scripts.js", "provider.json"]) {
-          const p = path26.join(dir, name);
+          const p = path27.join(dir, name);
           if (fs15.existsSync(p)) {
             const source = fs15.readFileSync(p, "utf-8");
             this.json(res, 200, { type, path: p, source, lines: source.split("\n").length });
@@ -47057,8 +47291,8 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const target = fs15.existsSync(path26.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
-        const targetPath = path26.join(dir, target);
+        const target = fs15.existsSync(path27.join(dir, "scripts.js")) ? "scripts.js" : "provider.json";
+        const targetPath = path27.join(dir, target);
         try {
           if (fs15.existsSync(targetPath)) fs15.copyFileSync(targetPath, targetPath + ".bak");
           fs15.writeFileSync(targetPath, source, "utf-8");
@@ -47205,7 +47439,7 @@ var init_dev_server = __esm({
         }
         let targetDir;
         targetDir = this.providerLoader.getUserProviderDir(category, type);
-        const jsonPath = path26.join(targetDir, "provider.json");
+        const jsonPath = path27.join(targetDir, "provider.json");
         if (fs15.existsSync(jsonPath)) {
           this.json(res, 409, { error: `Provider already exists at ${targetDir}`, path: targetDir });
           return;
@@ -47217,8 +47451,8 @@ var init_dev_server = __esm({
           const createdFiles = ["provider.json"];
           if (result.files) {
             for (const [relPath, content] of Object.entries(result.files)) {
-              const fullPath = path26.join(targetDir, relPath);
-              fs15.mkdirSync(path26.dirname(fullPath), { recursive: true });
+              const fullPath = path27.join(targetDir, relPath);
+              fs15.mkdirSync(path27.dirname(fullPath), { recursive: true });
               fs15.writeFileSync(fullPath, content, "utf-8");
               createdFiles.push(relPath);
             }
@@ -47271,22 +47505,22 @@ var init_dev_server = __esm({
         if (!fs15.existsSync(scriptsDir)) return null;
         const versions = fs15.readdirSync(scriptsDir).filter((d) => {
           try {
-            return fs15.statSync(path26.join(scriptsDir, d)).isDirectory();
+            return fs15.statSync(path27.join(scriptsDir, d)).isDirectory();
           } catch {
             return false;
           }
         }).sort((a, b) => b.localeCompare(a, void 0, { numeric: true, sensitivity: "base" }));
         if (versions.length === 0) return null;
-        return path26.join(scriptsDir, versions[0]);
+        return path27.join(scriptsDir, versions[0]);
       }
       resolveAutoImplWritableProviderDir(category, type, requestedDir) {
-        const canonicalUserDir = path26.resolve(this.providerLoader.getUserProviderDir(category, type));
-        const desiredDir = requestedDir ? path26.resolve(requestedDir) : canonicalUserDir;
-        const upstreamRoot = path26.resolve(this.providerLoader.getUpstreamDir());
-        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path26.sep}`)) {
+        const canonicalUserDir = path27.resolve(this.providerLoader.getUserProviderDir(category, type));
+        const desiredDir = requestedDir ? path27.resolve(requestedDir) : canonicalUserDir;
+        const upstreamRoot = path27.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path27.sep}`)) {
           return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        if (path26.basename(desiredDir) !== type) {
+        if (path27.basename(desiredDir) !== type) {
           return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
@@ -47294,11 +47528,11 @@ var init_dev_server = __esm({
           return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
         if (!fs15.existsSync(desiredDir)) {
-          fs15.mkdirSync(path26.dirname(desiredDir), { recursive: true });
+          fs15.mkdirSync(path27.dirname(desiredDir), { recursive: true });
           fs15.cpSync(sourceDir, desiredDir, { recursive: true });
           this.log(`Auto-implement writable copy created: ${desiredDir}`);
         }
-        const providerJson = path26.join(desiredDir, "provider.json");
+        const providerJson = path27.join(desiredDir, "provider.json");
         if (!fs15.existsSync(providerJson)) {
           return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
@@ -47334,7 +47568,7 @@ var init_dev_server = __esm({
           setMode: "set_mode.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path26.join(providerDir, "scripts");
+        const scriptsDir = path27.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -47345,7 +47579,7 @@ var init_dev_server = __esm({
           for (const file2 of fs15.readdirSync(latestScriptsDir)) {
             if (file2.endsWith(".js") && targetFileNames.has(file2)) {
               try {
-                const content = fs15.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
+                const content = fs15.readFileSync(path27.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -47362,7 +47596,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs15.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
+                const content = fs15.readFileSync(path27.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -47403,10 +47637,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path26.join(providerDir, "../../docs");
+        const docsDir = path27.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path26.join(docsDir, name);
+            const p = path27.join(docsDir, name);
             if (fs15.existsSync(p)) return fs15.readFileSync(p, "utf-8");
           } catch {
           }
@@ -47580,7 +47814,7 @@ var init_dev_server = __esm({
           parseApproval: "parse_approval.js"
         };
         const targetFileNames = new Set(functions.map((fn) => funcToFile[fn]).filter(Boolean));
-        const scriptsDir = path26.join(providerDir, "scripts");
+        const scriptsDir = path27.join(providerDir, "scripts");
         const latestScriptsDir = this.getLatestScriptVersionDir(scriptsDir);
         if (latestScriptsDir) {
           lines.push(`Scripts version directory: \`${latestScriptsDir}\``);
@@ -47592,7 +47826,7 @@ var init_dev_server = __esm({
             if (!file2.endsWith(".js")) continue;
             if (!targetFileNames.has(file2)) continue;
             try {
-              const content = fs15.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
+              const content = fs15.readFileSync(path27.join(latestScriptsDir, file2), "utf-8");
               lines.push(`### \`${file2}\` \u270F\uFE0F EDIT`);
               lines.push("```javascript");
               lines.push(content);
@@ -47608,7 +47842,7 @@ var init_dev_server = __esm({
             lines.push("");
             for (const file2 of refFiles) {
               try {
-                const content = fs15.readFileSync(path26.join(latestScriptsDir, file2), "utf-8");
+                const content = fs15.readFileSync(path27.join(latestScriptsDir, file2), "utf-8");
                 lines.push(`### \`${file2}\` \u{1F512}`);
                 lines.push("```javascript");
                 lines.push(content);
@@ -47641,10 +47875,10 @@ var init_dev_server = __esm({
             lines.push("");
           }
         }
-        const docsDir = path26.join(providerDir, "../../docs");
+        const docsDir = path27.join(providerDir, "../../docs");
         const loadGuide = (name) => {
           try {
-            const p = path26.join(docsDir, name);
+            const p = path27.join(docsDir, name);
             if (fs15.existsSync(p)) return fs15.readFileSync(p, "utf-8");
           } catch {
           }
@@ -49053,6 +49287,7 @@ __export(src_exports, {
   createGitWorkspaceMonitor: () => createGitWorkspaceMonitor,
   createInteractionId: () => createInteractionId,
   createMesh: () => createMesh,
+  createWorktree: () => createWorktree,
   deleteMesh: () => deleteMesh,
   detectAllVersions: () => detectAllVersions,
   detectCLIs: () => detectCLIs,
@@ -49105,6 +49340,7 @@ __export(src_exports, {
   launchWithCdp: () => launchWithCdp,
   listHostedCliRuntimes: () => listHostedCliRuntimes,
   listMeshes: () => listMeshes,
+  listWorktrees: () => listWorktrees,
   loadConfig: () => loadConfig,
   loadState: () => loadState,
   logCommand: () => logCommand,
@@ -49124,6 +49360,7 @@ __export(src_exports, {
   normalizeSessionModalFields: () => normalizeSessionModalFields,
   parsePorcelainV2Status: () => parsePorcelainV2Status,
   parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
+  parseWorktreeListOutput: () => parseWorktreeListOutput,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
   prepareSessionChatTailUpdate: () => prepareSessionChatTailUpdate,
@@ -49133,6 +49370,7 @@ __export(src_exports, {
   recordDebugTrace: () => recordDebugTrace,
   registerExtensionProviders: () => registerExtensionProviders,
   removeNode: () => removeNode,
+  removeWorktree: () => removeWorktree,
   resetConfig: () => resetConfig,
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
@@ -49142,6 +49380,7 @@ __export(src_exports, {
   resolveGitRepository: () => resolveGitRepository,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
+  resolveWorktreePath: () => resolveWorktreePath,
   runAsyncBatch: () => runAsyncBatch,
   runGit: () => runGit,
   saveConfig: () => saveConfig,
@@ -49347,13 +49586,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);
@@ -49455,17 +49695,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);
@@ -50660,12 +50902,12 @@ var init_peer_connection_manager = __esm({
 });
 
 // src/daemon-p2p/index.ts
-var fs16, path27, import_node_module3, esmRequire, DaemonP2PSender;
+var fs16, path28, import_node_module3, esmRequire, DaemonP2PSender;
 var init_daemon_p2p = __esm({
   "src/daemon-p2p/index.ts"() {
     "use strict";
     fs16 = __toESM(require("fs"));
-    path27 = __toESM(require("path"));
+    path28 = __toESM(require("path"));
     import_node_module3 = require("module");
     init_src();
     init_data_channel_router();
@@ -50744,15 +50986,15 @@ ${e?.stack || ""}`);
         const prebuildKey = `${platform12}-${arch3}`;
         try {
           const candidates = [
-            path27.join(__dirname, "node_modules", "node-datachannel"),
-            path27.join(__dirname, "..", "node_modules", "node-datachannel"),
-            path27.join(__dirname, "..", "..", "node_modules", "node-datachannel")
+            path28.join(__dirname, "node_modules", "node-datachannel"),
+            path28.join(__dirname, "..", "node_modules", "node-datachannel"),
+            path28.join(__dirname, "..", "..", "node_modules", "node-datachannel")
           ];
           for (const candidate of candidates) {
-            const prebuildPath = path27.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
+            const prebuildPath = path28.join(candidate, "prebuilds", prebuildKey, "node_datachannel.node");
             if (fs16.existsSync(prebuildPath)) {
-              const targetDir = path27.join(candidate, "build", "Release");
-              const targetPath = path27.join(targetDir, "node_datachannel.node");
+              const targetDir = path28.join(candidate, "build", "Release");
+              const targetPath = path28.join(targetDir, "node_datachannel.node");
               fs16.mkdirSync(targetDir, { recursive: true });
               fs16.copyFileSync(prebuildPath, targetPath);
               try {
@@ -51141,16 +51383,16 @@ var require_filesystem = __commonJS({
     var LDD_PATH = "/usr/bin/ldd";
     var SELF_PATH = "/proc/self/exe";
     var MAX_LENGTH = 2048;
-    var readFileSync20 = (path33) => {
-      const fd = fs20.openSync(path33, "r");
+    var readFileSync20 = (path34) => {
+      const fd = fs20.openSync(path34, "r");
       const buffer = Buffer.alloc(MAX_LENGTH);
       const bytesRead = fs20.readSync(fd, buffer, 0, MAX_LENGTH, 0);
       fs20.close(fd, () => {
       });
       return buffer.subarray(0, bytesRead);
     };
-    var readFile2 = (path33) => new Promise((resolve20, reject) => {
-      fs20.open(path33, "r", (err, fd) => {
+    var readFile2 = (path34) => new Promise((resolve20, reject) => {
+      fs20.open(path34, "r", (err, fd) => {
         if (err) {
           reject(err);
         } else {
@@ -51269,11 +51511,11 @@ var require_detect_libc = __commonJS({
       }
       return null;
     };
-    var familyFromInterpreterPath = (path33) => {
-      if (path33) {
-        if (path33.includes("/ld-musl-")) {
+    var familyFromInterpreterPath = (path34) => {
+      if (path34) {
+        if (path34.includes("/ld-musl-")) {
           return MUSL;
-        } else if (path33.includes("/ld-linux-")) {
+        } else if (path34.includes("/ld-linux-")) {
           return GLIBC;
         }
       }
@@ -51320,8 +51562,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = await readFile2(SELF_PATH);
-        const path33 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path33);
+        const path34 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path34);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -51333,8 +51575,8 @@ var require_detect_libc = __commonJS({
       cachedFamilyInterpreter = null;
       try {
         const selfContent = readFileSync20(SELF_PATH);
-        const path33 = interpreterPath(selfContent);
-        cachedFamilyInterpreter = familyFromInterpreterPath(path33);
+        const path34 = interpreterPath(selfContent);
+        cachedFamilyInterpreter = familyFromInterpreterPath(path34);
       } catch (e) {
       }
       return cachedFamilyInterpreter;
@@ -53053,18 +53295,18 @@ var require_sharp = __commonJS({
       `@img/sharp-${runtimePlatform}/sharp.node`,
       "@img/sharp-wasm32/sharp.node"
     ];
-    var path33;
+    var path34;
     var sharp;
     var errors = [];
-    for (path33 of paths) {
+    for (path34 of paths) {
       try {
-        sharp = require(path33);
+        sharp = require(path34);
         break;
       } catch (err) {
         errors.push(err);
       }
     }
-    if (sharp && path33.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
+    if (sharp && path34.startsWith("@img/sharp-linux-x64") && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for linux-x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -55341,10 +55583,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) {
@@ -55606,10 +55848,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) {
@@ -55973,15 +56215,15 @@ var require_color = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path33 = [graph[toModel].parent, toModel];
+      const path34 = [graph[toModel].parent, toModel];
       let fn = conversions_default[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path33.unshift(graph[cur].parent);
+        path34.unshift(graph[cur].parent);
         fn = link(conversions_default[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path33;
+      fn.conversion = path34;
       return fn;
     }
     function route(fromModel) {
@@ -56598,7 +56840,7 @@ var require_channel = __commonJS({
 var require_output = __commonJS({
   "../../node_modules/sharp/lib/output.js"(exports2, module2) {
     "use strict";
-    var path33 = require("path");
+    var path34 = require("path");
     var is = require_is();
     var sharp = require_sharp();
     var formats = /* @__PURE__ */ new Map([
@@ -56629,9 +56871,9 @@ var require_output = __commonJS({
       let err;
       if (!is.string(fileOut)) {
         err = new Error("Missing output file path");
-      } else if (is.string(this.options.input.file) && path33.resolve(this.options.input.file) === path33.resolve(fileOut)) {
+      } else if (is.string(this.options.input.file) && path34.resolve(this.options.input.file) === path34.resolve(fileOut)) {
         err = new Error("Cannot use same file for input and output");
-      } else if (jp2Regex.test(path33.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
+      } else if (jp2Regex.test(path34.extname(fileOut)) && !this.constructor.format.jp2k.output.file) {
         err = errJp2Save();
       }
       if (err) {
@@ -57908,11 +58150,11 @@ function quarantineLegacyStandaloneSessions(options) {
   const homeDir = options.homeDir || os24.homedir();
   const now = options.now || (() => /* @__PURE__ */ new Date());
   const isPidRunning = options.isPidRunning || defaultPidRunning;
-  const runtimesDir = path28.join(homeDir, ".adhdev", "session-host", options.appName, "runtimes");
+  const runtimesDir = path29.join(homeDir, ".adhdev", "session-host", options.appName, "runtimes");
   if (!fs17.existsSync(runtimesDir)) {
     return { movedCount: 0, skippedActiveCount: 0, backupDir: null };
   }
-  const candidates = fs17.readdirSync(runtimesDir).filter((name) => name.endsWith(".json")).map((name) => path28.join(runtimesDir, name));
+  const candidates = fs17.readdirSync(runtimesDir).filter((name) => name.endsWith(".json")).map((name) => path29.join(runtimesDir, name));
   let movedCount = 0;
   let skippedActiveCount = 0;
   let backupDir = null;
@@ -57930,26 +58172,26 @@ function quarantineLegacyStandaloneSessions(options) {
       continue;
     }
     if (!backupDir) {
-      backupDir = path28.join(
+      backupDir = path29.join(
         homeDir,
         ".adhdev",
         "session-host-backups",
         `legacy-standalone-${options.appName}-${formatTimestamp(now())}`
       );
-      fs17.mkdirSync(path28.join(backupDir, "runtimes"), { recursive: true });
+      fs17.mkdirSync(path29.join(backupDir, "runtimes"), { recursive: true });
     }
-    fs17.renameSync(sourcePath, path28.join(backupDir, "runtimes", path28.basename(sourcePath)));
+    fs17.renameSync(sourcePath, path29.join(backupDir, "runtimes", path29.basename(sourcePath)));
     movedCount += 1;
   }
   return { movedCount, skippedActiveCount, backupDir };
 }
-var fs17, os24, path28, LEGACY_STANDALONE_MANAGER_TAG;
+var fs17, os24, path29, LEGACY_STANDALONE_MANAGER_TAG;
 var init_session_host_hygiene = __esm({
   "src/session-host-hygiene.ts"() {
     "use strict";
     fs17 = __toESM(require("fs"));
     os24 = __toESM(require("os"));
-    path28 = __toESM(require("path"));
+    path29 = __toESM(require("path"));
     init_src();
     LEGACY_STANDALONE_MANAGER_TAG = "adhdev-standalone";
   }
@@ -57963,8 +58205,8 @@ function buildSessionHostEnv(baseEnv) {
 }
 function resolveSessionHostEntry() {
   const packagedCandidates = [
-    path29.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
-    path29.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
+    path30.resolve(__dirname, "../vendor/session-host-daemon/index.js"),
+    path30.resolve(__dirname, "../../vendor/session-host-daemon/index.js")
   ];
   for (const candidate of packagedCandidates) {
     if (fs18.existsSync(candidate)) {
@@ -57974,7 +58216,7 @@ function resolveSessionHostEntry() {
   return require.resolve("@adhdev/session-host-daemon");
 }
 function getSessionHostPidFile() {
-  return path29.join(os25.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
+  return path30.join(os25.homedir(), ".adhdev", `${SESSION_HOST_APP_NAME}-session-host.pid`);
 }
 function killPid2(pid) {
   try {
@@ -58077,9 +58319,9 @@ async function ensureSessionHostReady2() {
   }
   const spawnHost = () => {
     const entry = resolveSessionHostEntry();
-    const logDir = path29.join(os25.homedir(), ".adhdev", "logs");
+    const logDir = path30.join(os25.homedir(), ".adhdev", "logs");
     fs18.mkdirSync(logDir, { recursive: true });
-    const logFd = fs18.openSync(path29.join(logDir, "session-host.log"), "a");
+    const logFd = fs18.openSync(path30.join(logDir, "session-host.log"), "a");
     const child = (0, import_child_process12.spawn)(process.execPath, [entry], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
@@ -58114,14 +58356,14 @@ async function ensureSessionHostReady2() {
 async function listHostedCliRuntimes2(endpoint) {
   return listHostedCliRuntimes(endpoint);
 }
-var import_child_process12, fs18, os25, path29, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
+var import_child_process12, fs18, os25, path30, SESSION_HOST_APP_NAME, SESSION_HOST_START_TIMEOUT_MS;
 var init_session_host = __esm({
   "src/session-host.ts"() {
     "use strict";
     import_child_process12 = require("child_process");
     fs18 = __toESM(require("fs"));
     os25 = __toESM(require("os"));
-    path29 = __toESM(require("path"));
+    path30 = __toESM(require("path"));
     init_src();
     init_dist();
     init_session_host_hygiene();
@@ -58531,7 +58773,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;
     }
@@ -58590,12 +58832,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")) {
@@ -58813,18 +59055,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");
   }
 });
@@ -58863,7 +59105,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 = [];
@@ -58980,10 +59224,10 @@ function resolveDaemonPort(ref = {}) {
   return Number.isFinite(ref.port) && Number(ref.port) > 0 ? Number(ref.port) : DEFAULT_DAEMON_PORT;
 }
 function getDaemonPidFile(ref = {}) {
-  const dir = path30.join(ref.homeDir || os27.homedir(), ".adhdev");
+  const dir = path31.join(ref.homeDir || os27.homedir(), ".adhdev");
   if (!fs19.existsSync(dir)) fs19.mkdirSync(dir, { recursive: true });
   const port = resolveDaemonPort(ref);
-  return path30.join(dir, port === DEFAULT_DAEMON_PORT ? "daemon.pid" : `daemon-${port}.pid`);
+  return path31.join(dir, port === DEFAULT_DAEMON_PORT ? "daemon.pid" : `daemon-${port}.pid`);
 }
 function writeDaemonPid(pid, ref = {}) {
   const pidFile = getDaemonPidFile(ref);
@@ -59132,7 +59376,7 @@ function stopDaemon(ref = {}) {
     return false;
   }
 }
-var os27, fs19, path30, import_http, import_child_process13, import_ws3, pkgVersion, AdhdevDaemon;
+var os27, fs19, path31, import_http, import_child_process13, import_ws3, pkgVersion, AdhdevDaemon;
 var init_adhdev_daemon = __esm({
   "src/adhdev-daemon.ts"() {
     "use strict";
@@ -59146,7 +59390,7 @@ var init_adhdev_daemon = __esm({
     init_session_host_controller();
     os27 = __toESM(require("os"));
     fs19 = __toESM(require("fs"));
-    path30 = __toESM(require("path"));
+    path31 = __toESM(require("path"));
     import_http = require("http");
     import_child_process13 = require("child_process");
     import_ws3 = require("ws");
@@ -59154,7 +59398,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.1" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.11" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -59990,6 +60234,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);
@@ -60024,6 +60281,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,
@@ -60105,18 +60366,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 });
@@ -60256,7 +60506,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: {
@@ -60587,7 +60851,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);
@@ -70508,7 +70772,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";
@@ -71716,15 +71980,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path33 = [graph[toModel].parent, toModel];
+      const path34 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path33.unshift(graph[cur].parent);
+        path34.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path33;
+      fn.conversion = path34;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -75022,7 +75286,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join33(s) {
+        value: function join34(s) {
           if (this.length === 0) return "";
           var p = this.head;
           var ret = "" + p.data;
@@ -78632,7 +78896,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();
@@ -79327,7 +79591,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();
@@ -89081,15 +89345,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();
@@ -89148,7 +89412,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);
@@ -89163,14 +89427,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 {
@@ -89186,7 +89450,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);
         }
@@ -89220,7 +89484,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();
@@ -89594,9 +89858,9 @@ var init_prompt = __esm({
     init_utils();
     init_baseUI();
     _ = {
-      set: (obj, path33 = "", value) => {
+      set: (obj, path34 = "", value) => {
         let pointer = obj;
-        path33.split(".").forEach((key, index, arr) => {
+        path34.split(".").forEach((key, index, arr) => {
           if (key === "__proto__" || key === "constructor") return;
           if (index === arr.length - 1) {
             pointer[key] = value;
@@ -89606,8 +89870,8 @@ var init_prompt = __esm({
           pointer = pointer[key];
         });
       },
-      get: (obj, path33 = "", defaultValue) => {
-        const travel = (regexp) => String.prototype.split.call(path33, regexp).filter(Boolean).reduce(
+      get: (obj, path34 = "", defaultValue) => {
+        const travel = (regexp) => String.prototype.split.call(path34, regexp).filter(Boolean).reduce(
           // @ts-expect-error implicit any on res[key]
           (res, key) => res !== null && res !== void 0 ? res[key] : res,
           obj
@@ -90905,7 +91169,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")}
@@ -90921,10 +91236,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"],
@@ -90955,38 +91270,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,
@@ -90997,14 +91315,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({
@@ -91015,7 +91336,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."));
   }
@@ -91026,14 +91349,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();
@@ -91042,6 +91367,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"}`));
@@ -91052,11 +91378,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",
@@ -91073,7 +91400,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({
@@ -91115,7 +91442,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 })
@@ -91145,9 +91472,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();
@@ -91159,11 +91486,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([
@@ -91217,7 +91545,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) {
@@ -91225,7 +91553,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");
@@ -91238,7 +91566,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;
@@ -91247,12 +91575,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"));
@@ -91260,7 +91588,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) {
@@ -91273,14 +91601,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();
@@ -91291,7 +91619,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();
   }
 }
@@ -91306,7 +91634,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: