adhdev 0.9.56 → 0.9.58

package/dist/cli/index.js

@@ -35891,7 +35891,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             resolvedDir,
             resolvedCliArgs,
             resolvedProvider,
-            {},
+            this.providerLoader.getSettings(normalizedType),
             false,
             {
               providerSessionId: sessionBinding.providerSessionId,
@@ -38041,9 +38041,9 @@ function validateProviderDefinition(raw) {
   const typedProvider = provider;
   const controls = Array.isArray(provider.controls) ? provider.controls : [];
   if (category === "cli" || category === "acp") {
-    const spawn6 = provider.spawn;
-    const command = spawn6 && typeof spawn6 === "object" ? spawn6.command : void 0;
-    if (!spawn6 || typeof spawn6 !== "object") {
+    const spawn7 = provider.spawn;
+    const command = spawn7 && typeof spawn7 === "object" ? spawn7.command : void 0;
+    if (!spawn7 || typeof spawn7 !== "object") {
       errors.push(`${String(category).toUpperCase()}/CLI providers must have spawn config`);
     } else if (typeof command !== "string" || !command.trim()) {
       errors.push("spawn.command is required");
@@ -46267,8 +46267,8 @@ async function handleAutoImplement(ctx, type, req, res) {
     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);
-    const spawn6 = agentProvider?.spawn;
-    if (!spawn6?.command) {
+    const spawn7 = agentProvider?.spawn;
+    if (!spawn7?.command) {
       try {
         fs14.unlinkSync(promptFile);
       } catch {
@@ -46278,22 +46278,22 @@ async function handleAutoImplement(ctx, type, req, res) {
     }
     const agentCategory = agentProvider?.category;
     if (agentCategory === "acp") {
-      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn6.command} ${(spawn6.args || []).join(" ")}` } });
+      sendAutoImplSSE(ctx, { event: "progress", data: { function: "_init", status: "spawning", message: `Spawning ACP agent: ${spawn7.command} ${(spawn7.args || []).join(" ")}` } });
       ctx.autoImplStatus.running = true;
       ctx.autoImplStatus.type = type;
       const { ClientSideConnection: ClientSideConnection2, ndJsonStream: ndJsonStream2, PROTOCOL_VERSION: PROTOCOL_VERSION2 } = await Promise.resolve().then(() => (init_acp(), acp_exports));
       const { Readable: Readable3, Writable: Writable3 } = await import("stream");
       const { spawn: spawnFn2 } = await import("child_process");
-      const acpArgs = [...spawn6.args || []];
+      const acpArgs = [...spawn7.args || []];
       if (model) {
         acpArgs.push("--model", model);
         ctx.log(`Auto-implement ACP using model: ${model}`);
       }
-      const child2 = spawnFn2(spawn6.command, acpArgs, {
+      const child2 = spawnFn2(spawn7.command, acpArgs, {
         cwd: providerDir,
         stdio: ["pipe", "pipe", "pipe"],
-        shell: spawn6.shell ?? false,
-        env: { ...process.env, ...spawn6.env || {} }
+        shell: spawn7.shell ?? false,
+        env: { ...process.env, ...spawn7.env || {} }
       });
       ctx.autoImplProcess = child2;
       child2.stderr?.on("data", (d) => {
@@ -46403,7 +46403,7 @@ async function handleAutoImplement(ctx, type, req, res) {
       ctx.json(res, 202, {
         started: true,
         type,
-        agent: spawn6.command,
+        agent: spawn7.command,
         functions,
         providerDir,
         message: "ACP Auto-implement started. Connect to SSE for progress.",
@@ -46411,10 +46411,10 @@ async function handleAutoImplement(ctx, type, req, res) {
       });
       return;
     }
-    const command = spawn6.command;
-    const autoImpl = spawn6.autoImpl;
+    const command = spawn7.command;
+    const autoImpl = spawn7.autoImpl;
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
-    const baseArgs = [...spawn6.args || []].filter((a) => !interactiveFlags.includes(a));
+    const baseArgs = [...spawn7.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
     const isWin = os24.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
@@ -46461,7 +46461,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         cols: 120,
         rows: 40,
         cwd: providerDir,
-        env: { ...process.env, ...spawn6.env || {} }
+        env: { ...process.env, ...spawn7.env || {} }
       });
       isPty = true;
     } catch (err) {
@@ -46473,7 +46473,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          ...spawn6.env || {}
+          ...spawn7.env || {}
         }
       });
       child.on("error", (err2) => {
@@ -47645,16 +47645,16 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn6 = provider.spawn;
-        if (!spawn6) {
+        const spawn7 = provider.spawn;
+        if (!spawn7) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
         }
         const { spawn: spawnFn } = await import("child_process");
         const start = Date.now();
         try {
-          const child = spawnFn(spawn6.command, [...spawn6.args || []], {
-            shell: spawn6.shell ?? false,
+          const child = spawnFn(spawn7.command, [...spawn7.args || []], {
+            shell: spawn7.shell ?? false,
             timeout: 5e3,
             stdio: ["pipe", "pipe", "pipe"]
           });
@@ -47686,7 +47686,7 @@ var init_dev_server = __esm({
           const elapsed = Date.now() - start;
           this.json(res, 200, {
             success: true,
-            command: `${spawn6.command} ${(spawn6.args || []).join(" ")}`,
+            command: `${spawn7.command} ${(spawn7.args || []).join(" ")}`,
             elapsed,
             stdout: stdout.trim(),
             stderr: stderr.trim(),
@@ -47696,7 +47696,7 @@ var init_dev_server = __esm({
           const elapsed = Date.now() - start;
           this.json(res, 200, {
             success: false,
-            command: `${spawn6.command} ${(spawn6.args || []).join(" ")}`,
+            command: `${spawn7.command} ${(spawn7.args || []).join(" ")}`,
             elapsed,
             error: e.message
           });
@@ -48159,20 +48159,20 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const spawn6 = provider.spawn;
-        if (!spawn6) {
+        const spawn7 = provider.spawn;
+        if (!spawn7) {
           this.json(res, 400, { error: `Provider ${type} has no spawn config` });
           return;
         }
         const { spawn: spawnFn } = await import("child_process");
         const start = Date.now();
         try {
-          const args = [...spawn6.args || [], message];
-          const child = spawnFn(spawn6.command, args, {
-            shell: spawn6.shell ?? false,
+          const args = [...spawn7.args || [], message];
+          const child = spawnFn(spawn7.command, args, {
+            shell: spawn7.shell ?? false,
             timeout,
             stdio: ["pipe", "pipe", "pipe"],
-            env: { ...process.env, ...spawn6.env || {} }
+            env: { ...process.env, ...spawn7.env || {} }
           });
           let stdout = "";
           let stderr = "";
@@ -80979,6 +80979,58 @@ var init_server_connection = __esm({
       onStateChange(callback) {
         this.stateChangeCallbacks.push(callback);
       }
+      /**
+       * Send a command to another daemon owned by the same user, via server relay.
+       * The server validates ownership before forwarding to the target daemon.
+       *
+       * Returns the command result or throws on timeout / auth failure.
+       */
+      sendMeshCommand(targetDaemonId, command, args = {}, timeoutMs = 3e4) {
+        return new Promise((resolve21, reject) => {
+          const requestId = `mesh_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+          const timer = setTimeout(() => {
+            this.off("daemon_mesh_result", handler);
+            reject(new Error(`Mesh command timed out after ${timeoutMs}ms`));
+          }, timeoutMs);
+          const handler = (msg) => {
+            if (msg.payload?.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"));
+            } else {
+              resolve21(msg.payload?.result);
+            }
+          };
+          this.on("daemon_mesh_result", handler);
+          const sent = this.ws?.readyState === 1 && (() => {
+            try {
+              this.ws.send(JSON.stringify({
+                type: "daemon_mesh_command",
+                requestId,
+                targetDaemonId,
+                command,
+                args,
+                timestamp: Date.now()
+              }));
+              return true;
+            } catch {
+              return false;
+            }
+          })();
+          if (!sent) {
+            clearTimeout(timer);
+            this.off("daemon_mesh_result", handler);
+            reject(new Error("Not connected to server"));
+          }
+        });
+      }
+      off(type, handler) {
+        const handlers = this.messageHandlers.get(type);
+        if (!handlers) return;
+        const idx = handlers.indexOf(handler);
+        if (idx !== -1) handlers.splice(idx, 1);
+      }
       getState() {
         return this.state;
       }
@@ -89935,6 +89987,64 @@ var init_session_host_controller = __esm({
   }
 });
 
+// src/daemon-mesh-manager.ts
+var daemon_mesh_manager_exports = {};
+__export(daemon_mesh_manager_exports, {
+  DaemonMeshManager: () => DaemonMeshManager
+});
+function interpolateArgs(args, context) {
+  const result = {};
+  for (const [k, v] of Object.entries(args)) {
+    result[k] = typeof v === "string" ? interpolateString(v, context) : v;
+  }
+  return result;
+}
+function interpolateString(template, ctx) {
+  return template.replace(/\{\{(\w+)\}\}/g, (_2, key) => {
+    const val = ctx[key];
+    return val !== void 0 ? String(val) : `{{${key}}}`;
+  });
+}
+var DaemonMeshManager;
+var init_daemon_mesh_manager = __esm({
+  "src/daemon-mesh-manager.ts"() {
+    "use strict";
+    init_src();
+    DaemonMeshManager = class {
+      rules = [];
+      serverConn;
+      constructor(serverConn) {
+        this.serverConn = serverConn;
+      }
+      setRules(rules) {
+        this.rules = rules;
+        LOG.info("Mesh", `[Mesh] ${rules.length} rule(s) loaded`);
+      }
+      async emit(event) {
+        const matching = this.rules.filter((r) => r.trigger === event.trigger);
+        if (matching.length === 0) return;
+        await Promise.allSettled(
+          matching.map((rule) => this.executeRule(rule, event.context ?? {}))
+        );
+      }
+      async executeRule(rule, context) {
+        const args = interpolateArgs(rule.args ?? {}, context);
+        try {
+          LOG.info("Mesh", `[Mesh] Relaying '${rule.command}' \u2192 ${rule.targetDaemonId.slice(0, 12)}\u2026`);
+          await this.serverConn.sendMeshCommand(rule.targetDaemonId, rule.command, args);
+          LOG.info("Mesh", `[Mesh] Relay '${rule.command}' complete`);
+        } catch (err) {
+          LOG.warn("Mesh", `[Mesh] Relay '${rule.command}' failed: ${err?.message ?? err}`);
+        }
+      }
+      /** Convenience: send a one-off mesh command without a rule. */
+      async sendCommand(targetDaemonId, command, args = {}) {
+        return this.serverConn.sendMeshCommand(targetDaemonId, command, args);
+      }
+    };
+  }
+});
+
 // src/adhdev-daemon.ts
 var adhdev_daemon_exports = {};
 __export(adhdev_daemon_exports, {
@@ -90179,13 +90289,14 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.56" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.58" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
       localClients = /* @__PURE__ */ new Set();
       serverConn = null;
       p2p = null;
+      meshManager = null;
       screenshotController = null;
       statusReporter = null;
       topicSubscriptionTimer = null;
@@ -90769,6 +90880,12 @@ ${err?.stack || ""}`);
             }
           });
           this.p2p = new DaemonP2PSender(this.serverConn);
+          const { DaemonMeshManager: DaemonMeshManager2 } = await Promise.resolve().then(() => (init_daemon_mesh_manager(), daemon_mesh_manager_exports));
+          this.meshManager = new DaemonMeshManager2(this.serverConn);
+          const meshRules = config2.meshRules;
+          if (Array.isArray(meshRules) && meshRules.length > 0) {
+            this.meshManager.setRules(meshRules);
+          }
           if (this.p2p.isAvailable) {
             console.log(source_default.green("  \u{1F517} P2P available (node-datachannel)"));
             this.p2p.onInput(async (event) => {
@@ -91107,6 +91224,16 @@ ${err?.stack || ""}`);
           if (cmdType.startsWith("git_")) {
             void this.flushP2PWorkspaceGitSubscriptions();
           }
+          if (cmdType === "git_checkpoint" && routed.success && this.meshManager) {
+            void this.meshManager.emit({
+              trigger: "git_checkpoint_complete",
+              context: {
+                workspace: String(normalizedData.workspace ?? ""),
+                checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
+                commit: routed.checkpoint?.commit ?? ""
+              }
+            });
+          }
           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 });
@@ -93817,9 +93944,9 @@ async function requestSessionHostDirect(request) {
   }
 }
 async function runRuntimeLaunchSpec(spec) {
-  const { spawn: spawn6 } = await import("child_process");
+  const { spawn: spawn7 } = await import("child_process");
   return await new Promise((resolve21, reject) => {
-    const child = spawn6(spec.command, spec.args, {
+    const child = spawn7(spec.command, spec.args, {
       stdio: "inherit",
       env: spec.env,
       shell: process.platform === "win32" && spec.command !== process.execPath
@@ -94088,7 +94215,7 @@ async function handleTraceCommand(options) {
 async function runDaemonUpgrade(options, pkgVersion3) {
   const { isDaemonRunning: isDaemonRunning2, stopDaemon: stopDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
   const { stopManagedSessionHostProcess: stopManagedSessionHostProcess2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
-  const { execSync: execSync8, spawn: spawn6 } = await import("child_process");
+  const { execSync: execSync8, spawn: spawn7 } = await import("child_process");
   const fsMod = await import("fs");
   const pathMod = await import("path");
   console.log(source_default.bold("\n  \u{1F504} ADHDev Upgrade\n"));
@@ -94172,7 +94299,7 @@ async function runDaemonUpgrade(options, pkgVersion3) {
     await new Promise((r) => setTimeout(r, 2e3));
     stopManagedSessionHostProcess2();
     await new Promise((r) => setTimeout(r, 500));
-    const child = spawn6(process.execPath, [process.argv[1], "daemon", "-p", DEFAULT_DAEMON_PORT_TEXT], {
+    const child = spawn7(process.execPath, [process.argv[1], "daemon", "-p", DEFAULT_DAEMON_PORT_TEXT], {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
@@ -94219,7 +94346,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     }
   });
   program2.command("standalone").description("\u{1F5A5}\uFE0F  Start ADHDev Standalone Server (Local Dashboard & Embedded Daemon)").option("-p, --port <port>", "Local HTTP/WS server port", "3847").option("--host <host>", "Bind to specific host (use 0.0.0.0 for LAN access)").option("--no-open", "Prevent opening browser automatically").option("--token <token>", "Require token authentication").option("--dev", "Enable Dev Mode").action(async (options) => {
-    const { spawn: spawn6, execSync: execSync8 } = await import("child_process");
+    const { spawn: spawn7, execSync: execSync8 } = await import("child_process");
     const { DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: DEFAULT_STANDALONE_SESSION_HOST_APP_NAME2, resolveSessionHostAppNameResolution: resolveSessionHostAppNameResolution2 } = await Promise.resolve().then(() => (init_src(), src_exports));
     console.log(source_default.cyan("\n  Starting ADHDev Standalone Server..."));
     const args = [];
@@ -94248,7 +94375,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     }
     console.log(source_default.gray(`  Session host namespace: ${sessionHostName}${sessionHostResolution.source === "default" ? " (default isolated standalone namespace)" : sessionHostResolution.source === "explicit" ? " (from ADHDEV_SESSION_HOST_NAME)" : " (auto-corrected for standalone isolation)"}`));
     const spawnArgs = bin === "npx" ? npxArgs : args;
-    const child = spawn6(bin, spawnArgs, {
+    const child = spawn7(bin, spawnArgs, {
       stdio: "inherit",
       shell: process.platform === "win32",
       env: standaloneEnv
@@ -94722,7 +94849,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
   hideCommand(program2.command("daemon:restart").description("Restart ADHDev Daemon (stop \u2192 start)").option("-p, --port <port>", "Local WS server port", DEFAULT_DAEMON_PORT_TEXT).option("--server <url>", "Override server URL").option("--dev", "Enable Dev Mode").action(async (options) => {
     const { stopDaemon: stopDaemon2, isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
     const { stopManagedSessionHostProcess: stopManagedSessionHostProcess2 } = await Promise.resolve().then(() => (init_session_host(), session_host_exports));
-    const { spawn: spawn6 } = await import("child_process");
+    const { spawn: spawn7 } = await import("child_process");
     if (isDaemonRunning2({ port: parseInt(options.port, 10) || DEFAULT_DAEMON_PORT })) {
       console.log(source_default.yellow("\n  Stopping existing daemon..."));
       stopDaemon2({ port: parseInt(options.port, 10) || DEFAULT_DAEMON_PORT });
@@ -94734,7 +94861,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     const args = ["daemon", "-p", options.port || DEFAULT_DAEMON_PORT_TEXT];
     if (options.server) args.push("--server", options.server);
     if (options.dev) args.push("--dev");
-    const child = spawn6(process.execPath, [process.argv[1], ...args], {
+    const child = spawn7(process.execPath, [process.argv[1], ...args], {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
@@ -96738,6 +96865,64 @@ function registerCdpCommands(program2) {
   });
 }
 
+// src/cli/mcp-commands.ts
+var import_node_child_process3 = require("child_process");
+var import_node_module3 = require("module");
+init_source();
+function registerMcpCommands(program2) {
+  program2.command("mcp").description("Start an MCP server to expose IDE agents as tools (for Claude Desktop, etc.)").option("--api-key <key>", "ADHDev cloud API key (switches to cloud mode)").option("--port <n>", "Standalone daemon port (default: 3847)", "3847").option("--password <pass>", "Standalone daemon password (if set)").option("--base-url <url>", "Override cloud API base URL").addHelpText("after", `
+Examples:
+  adhdev mcp                          Local mode (requires: adhdev standalone)
+  adhdev mcp --api-key adk_xxx        Cloud mode (no local daemon needed)
+
+Claude Desktop config (~/.claude_desktop_config.json):
+  {
+    "mcpServers": {
+      "adhdev": {
+        "command": "adhdev",
+        "args": ["mcp"]
+      }
+    }
+  }
+
+Tools available (local):  list_sessions, read_chat, send_chat, approve, screenshot, git_status
+Tools available (cloud):  list_sessions, read_chat, send_chat, approve
+        `).action(async (opts) => {
+    const mcpBin = resolveMcpBin();
+    if (!mcpBin) {
+      console.error(source_default.red("\u2717 @adhdev/mcp-server not found. Run: npm install -g @adhdev/mcp-server"));
+      process.exit(1);
+    }
+    const args = [];
+    if (opts.apiKey) args.push("--api-key", opts.apiKey);
+    if (opts.port && opts.port !== "3847") args.push("--port", opts.port);
+    if (opts.password) args.push("--password", opts.password);
+    if (opts.baseUrl) args.push("--base-url", opts.baseUrl);
+    const env3 = { ...process.env };
+    if (opts.apiKey) env3.ADHDEV_API_KEY = opts.apiKey;
+    if (opts.password) env3.ADHDEV_PASSWORD = opts.password;
+    const child = (0, import_node_child_process3.spawn)(process.execPath, [mcpBin, ...args], {
+      stdio: "inherit",
+      env: env3
+    });
+    child.on("error", (err) => {
+      console.error(source_default.red(`\u2717 MCP server error: ${err.message}`));
+      process.exit(1);
+    });
+    child.on("exit", (code) => {
+      process.exit(code ?? 0);
+    });
+  });
+}
+function resolveMcpBin() {
+  try {
+    const req = (0, import_node_module3.createRequire)(__filename);
+    return req.resolve("@adhdev/mcp-server");
+  } catch {
+    return null;
+  }
+}
+
 // src/cli/index.ts
 init_version();
 var pkgVersion2 = resolvePackageVersion();
@@ -96757,6 +96942,7 @@ registerDoctorCommands(program, pkgVersion2);
 registerProviderCommands(program);
 registerCdpCommands(program);
 registerServiceCommands(program);
+registerMcpCommands(program);
 void (async () => {
   const helperMode = await maybeRunDaemonUpgradeHelperFromEnv();
   if (helperMode) {
@@ -96783,6 +96969,7 @@ void (async () => {
     console.log(source_default.gray("  Advanced tools:"));
     console.log(source_default.gray("    adhdev trace --category session_host \u2014 Inspect structured daemon trace"));
     console.log(source_default.gray("    adhdev service           \u2014 Manage OS background auto-start service"));
+    console.log(source_default.gray("    adhdev mcp               \u2014 Start MCP server (expose agents to Claude Desktop, etc.)"));
     console.log(source_default.gray("    adhdev provider ...      \u2014 Provider development commands"));
     console.log(source_default.gray("    adhdev cdp ...           \u2014 CDP debugging tools"));
     console.log();