adhdev 0.9.60 → 0.9.62

package/dist/index.js

@@ -59187,7 +59187,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.60" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.62" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adhdev",
-  "version": "0.9.60",
+  "version": "0.9.62",
   "description": "ADHDev — Agent Dashboard Hub for Dev. Remote-control AI coding agents from anywhere.",
   "main": "dist/index.js",
   "bin": {

package/vendor/mcp-server/index.js

@@ -129,6 +129,18 @@ var CloudTransport = class {
     if (!res.ok) throw new Error(`Git status failed: ${res.status}`);
     return res.json();
   }
+  async stop(daemonId, opts) {
+    const res = await fetch(
+      `${this.baseUrl}/api/v1/shortcuts/${encodeURIComponent(daemonId)}/stop`,
+      {
+        method: "POST",
+        headers: this.headers(),
+        body: JSON.stringify(opts)
+      }
+    );
+    if (!res.ok) throw new Error(`Stop failed: ${res.status}`);
+    return res.json();
+  }
   async launch(daemonId, opts) {
     const res = await fetch(
       `${this.baseUrl}/api/v1/shortcuts/${encodeURIComponent(daemonId)}/launch`,
@@ -161,10 +173,14 @@ var FORMAT_PROP = {
 };
 var LIST_SESSIONS_TOOL = {
   name: "list_sessions",
-  description: "List all currently connected IDE and CLI agent sessions on the local machine.",
+  description: "List all connected agent sessions. In cloud mode, fetches session state from each daemon (data is sourced from daemon WS status reports, up to 30s stale). Pass daemon_id to scope to a single daemon.",
   inputSchema: {
     type: "object",
     properties: {
+      daemon_id: {
+        type: "string",
+        description: "Daemon ID (cloud mode only). Omit to list sessions across all daemons."
+      },
       ...FORMAT_PROP
     },
     required: []
@@ -187,46 +203,122 @@ async function listSessions(transport, args = {}) {
       }, null, 2);
     }
     if (sessions.length === 0) return "No active sessions.";
-    const lines2 = sessions.map((s) => {
+    const lines = sessions.map((s) => {
       const parts = [`id: ${s.id}`, `type: ${s.providerType ?? s.type ?? "unknown"}`];
       if (s.label) parts.push(`label: ${s.label}`);
-      if (s.agentStatus) parts.push(`status: ${s.agentStatus}`);
+      if (s.status ?? s.agentStatus) parts.push(`status: ${s.status ?? s.agentStatus}`);
       if (s.workspace) parts.push(`workspace: ${s.workspace}`);
       return parts.join(", ");
     });
     return `Sessions (${sessions.length}):
-${lines2.join("\n")}`;
+${lines.join("\n")}`;
   }
-  const data = await transport.listDaemons();
-  const daemons = data?.daemons ?? data ?? [];
-  if (asJson) {
-    const sessions = [];
-    for (const d of daemons) {
-      for (const s of d.sessions ?? []) {
-        sessions.push({
-          daemon_id: d.id,
-          id: s.id,
-          type: s.providerType ?? "unknown",
-          status: s.status ?? s.agentStatus ?? null,
-          workspace: s.workspace ?? null
-        });
-      }
+  return listSessionsCloud(transport, args.daemon_id, asJson);
+}
+async function listSessionsCloud(transport, daemonId, asJson) {
+  const collected = [];
+  if (daemonId) {
+    const daemonStatus = await transport.getDaemonStatus(daemonId);
+    for (const s of daemonStatus?.sessions ?? []) {
+      collected.push({ daemonId, session: s });
     }
-    return JSON.stringify({ sessions }, null, 2);
-  }
-  if (daemons.length === 0) return "No connected daemons.";
-  const lines = [];
-  for (const d of daemons) {
-    const sessions = d.sessions ?? [];
-    for (const s of sessions) {
-      lines.push(
-        `daemon: ${d.id}, session: ${s.id}, type: ${s.providerType ?? "unknown"}${s.agentStatus ? `, status: ${s.agentStatus}` : ""}`
+  } else {
+    const data = await transport.listDaemons();
+    const daemons = data?.daemons ?? [];
+    for (let i = 0; i < daemons.length; i += 5) {
+      await Promise.allSettled(
+        daemons.slice(i, i + 5).map(async (d) => {
+          try {
+            const daemonStatus = await transport.getDaemonStatus(d.id);
+            for (const s of daemonStatus?.sessions ?? []) {
+              collected.push({ daemonId: d.id, session: s });
+            }
+          } catch {
+          }
+        })
       );
     }
-    if (sessions.length === 0) lines.push(`daemon: ${d.id} (no sessions)`);
   }
-  return lines.length > 0 ? `Sessions:
-${lines.join("\n")}` : "No active sessions.";
+  if (asJson) {
+    return JSON.stringify({
+      sessions: collected.map(({ daemonId: dId, session: s }) => ({
+        daemon_id: dId,
+        id: s.id,
+        type: s.providerType ?? "unknown",
+        status: s.status ?? null,
+        workspace: s.workspace ?? null
+      }))
+    }, null, 2);
+  }
+  if (collected.length === 0) return "No active sessions.";
+  const lines = collected.map(({ daemonId: dId, session: s }) => {
+    const parts = [
+      `daemon: ${dId}`,
+      `session: ${s.id}`,
+      `type: ${s.providerType ?? "unknown"}`
+    ];
+    if (s.status) parts.push(`status: ${s.status}`);
+    if (s.workspace) parts.push(`workspace: ${s.workspace}`);
+    return parts.join(", ");
+  });
+  return `Sessions (${collected.length}):
+${lines.join("\n")}`;
+}
+
+// src/tools/list-daemons.ts
+var LIST_DAEMONS_TOOL = {
+  name: "list_daemons",
+  description: "List all connected daemons (machines running the ADHDev agent). Use this to discover daemon IDs before calling launch_session, git_status, or other tools that require daemon_id. In local mode returns the single standalone daemon info.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      ...FORMAT_PROP
+    },
+    required: []
+  }
+};
+async function listDaemons(transport, args = {}) {
+  const asJson = args.format === "json";
+  if ("getStatus" in transport) {
+    const status = await transport.getStatus();
+    const daemon = {
+      id: status?.id ?? status?.instanceId ?? "standalone",
+      hostname: status?.hostname ?? status?.machine?.hostname ?? "localhost",
+      platform: status?.platform ?? status?.machine?.platform ?? "unknown",
+      version: status?.version ?? null,
+      sessions: (status?.sessions ?? []).length
+    };
+    if (asJson) return JSON.stringify({ daemons: [daemon] }, null, 2);
+    return `Daemons (1):
+  id: ${daemon.id}, hostname: ${daemon.hostname}, platform: ${daemon.platform}${daemon.version ? `, version: ${daemon.version}` : ""}, sessions: ${daemon.sessions}`;
+  }
+  const data = await transport.listDaemons();
+  const daemons = data?.daemons ?? [];
+  if (asJson) {
+    return JSON.stringify({
+      daemons: daemons.map((d) => ({
+        id: d.id,
+        hostname: d.hostname ?? null,
+        platform: d.platform ?? null,
+        nickname: d.nickname ?? null,
+        version: d.version ?? null,
+        p2p_available: d.p2p?.available ?? null,
+        cdp_connected: d.cdpConnected ?? null
+      }))
+    }, null, 2);
+  }
+  if (daemons.length === 0) return "No connected daemons.";
+  const lines = daemons.map((d) => {
+    const parts = [`id: ${d.id}`];
+    if (d.nickname) parts.push(`nickname: ${d.nickname}`);
+    if (d.hostname) parts.push(`hostname: ${d.hostname}`);
+    if (d.platform) parts.push(`platform: ${d.platform}`);
+    if (d.version) parts.push(`version: ${d.version}`);
+    if (d.p2p?.available != null) parts.push(`p2p: ${d.p2p.available ? "yes" : "no"}`);
+    return parts.join(", ");
+  });
+  return `Daemons (${daemons.length}):
+${lines.join("\n")}`;
 }
 
 // src/tools/read-chat.ts
@@ -380,17 +472,13 @@ async function approve(transport, args) {
 // src/tools/screenshot.ts
 var SCREENSHOT_TOOL = {
   name: "screenshot",
-  description: "Capture a screenshot of the current IDE window. Returns the image.",
+  description: "Capture a screenshot of the current IDE window. Returns the image. Local mode only \u2014 screenshots require direct P2P access to the daemon and are not available in cloud mode.",
   inputSchema: {
     type: "object",
     properties: {
       session_id: {
         type: "string",
         description: "Target session ID. Omit to use the active session."
-      },
-      daemon_id: {
-        type: "string",
-        description: "Daemon ID (cloud mode only)."
       }
     },
     required: []
@@ -579,6 +667,57 @@ async function launchSession(transport, args) {
   return id ? `Session launched. id: ${id}, type: ${args.type}` : `Launched: ${JSON.stringify(result)}`;
 }
 
+// src/tools/stop-session.ts
+var STOP_SESSION_TOOL = {
+  name: "stop_session",
+  description: "Stop a running agent session. For CLI agents (hermes-cli, claude-cli, etc.) this sends a graceful stop signal. Use list_sessions to find the session_id.",
+  inputSchema: {
+    type: "object",
+    properties: {
+      session_id: {
+        type: "string",
+        description: "Session ID to stop (from list_sessions)."
+      },
+      daemon_id: {
+        type: "string",
+        description: "Daemon ID (cloud mode only, required)."
+      },
+      type: {
+        type: "string",
+        description: "Provider type (e.g. hermes-cli, claude-cli). Cloud mode: auto-resolved from session_id if omitted."
+      }
+    },
+    required: ["session_id"]
+  }
+};
+async function stopSession(transport, args) {
+  if ("command" in transport) {
+    const local = transport;
+    let resolvedType = args.type;
+    if (!resolvedType) {
+      const status = await local.getStatus();
+      const session = (status?.sessions ?? []).find((s) => s.id === args.session_id);
+      resolvedType = session?.providerType ?? session?.type;
+    }
+    if (!resolvedType) {
+      return `Error: could not resolve session type for ${args.session_id}. Pass type= explicitly.`;
+    }
+    const result2 = await local.command("stop_cli", {
+      targetSessionId: args.session_id,
+      cliType: resolvedType
+    });
+    if (result2?.success === false) return `Error: ${result2.error ?? "stop failed"}`;
+    return `Session ${args.session_id} stopped.`;
+  }
+  if (!args.daemon_id) throw new Error("daemon_id is required in cloud mode");
+  const result = await transport.stop(args.daemon_id, {
+    id: args.session_id,
+    ...args.type ? { type: args.type } : {}
+  });
+  if (result?.success === false || result?.error) return `Error: ${result.error ?? "stop failed"}`;
+  return `Session ${args.session_id} stopped.`;
+}
+
 // src/tools/check-pending.ts
 var CHECK_PENDING_TOOL = {
   name: "check_pending",
@@ -695,8 +834,10 @@ async function startMcpServer(opts) {
   }
   const isLocal = opts.mode === "local";
   const allTools = [
+    LIST_DAEMONS_TOOL,
     LIST_SESSIONS_TOOL,
     LAUNCH_SESSION_TOOL,
+    STOP_SESSION_TOOL,
     CHECK_PENDING_TOOL,
     READ_CHAT_TOOL,
     SEND_CHAT_TOOL,
@@ -705,7 +846,7 @@ async function startMcpServer(opts) {
     ...isLocal ? [SCREENSHOT_TOOL] : []
   ];
   const server = new import_server.Server(
-    { name: "adhdev-mcp-server", version: "0.9.60" },
+    { name: "adhdev-mcp-server", version: "0.9.62" },
     { capabilities: { tools: {} } }
   );
   server.setRequestHandler(import_types.ListToolsRequestSchema, async () => ({ tools: allTools }));
@@ -714,8 +855,12 @@ async function startMcpServer(opts) {
     const a = args ?? {};
     try {
       switch (name) {
+        case "list_daemons": {
+          const text = await listDaemons(transport, { format: a.format });
+          return { content: [{ type: "text", text }] };
+        }
         case "list_sessions": {
-          const text = await listSessions(transport, { format: a.format });
+          const text = await listSessions(transport, { format: a.format, daemon_id: a.daemon_id });
           return { content: [{ type: "text", text }] };
         }
         case "read_chat": {
@@ -732,7 +877,7 @@ async function startMcpServer(opts) {
           return { content: [{ type: "text", text }] };
         }
         case "screenshot": {
-          const result = await screenshot(transport, { session_id: a.session_id, daemon_id: a.daemon_id });
+          const result = await screenshot(transport, { session_id: a.session_id });
           if (result.type === "image") {
             return {
               content: [{ type: "image", data: result.data, mimeType: result.mimeType }]
@@ -753,6 +898,14 @@ async function startMcpServer(opts) {
           });
           return { content: [{ type: "text", text }] };
         }
+        case "stop_session": {
+          const text = await stopSession(transport, {
+            session_id: a.session_id,
+            daemon_id: a.daemon_id,
+            type: a.type
+          });
+          return { content: [{ type: "text", text }] };
+        }
         case "check_pending": {
           const text = await checkPending(transport, { daemon_id: a.daemon_id, format: a.format });
           return { content: [{ type: "text", text }] };
@@ -823,8 +976,8 @@ Environment variables:
   ADHDEV_API_KEY      API key (cloud mode)
   ADHDEV_PASSWORD     Daemon password (local mode)
 
-Local mode tools:   list_sessions, launch_session, check_pending, read_chat, send_chat, approve, git_status, screenshot
-Cloud mode tools:   list_sessions, launch_session, check_pending, read_chat, send_chat, approve, git_status
+Local mode tools:   list_daemons, list_sessions, launch_session, stop_session, check_pending, read_chat, send_chat, approve, git_status, screenshot
+Cloud mode tools:   list_daemons, list_sessions, launch_session, stop_session, check_pending, read_chat, send_chat, approve, git_status
 `.trim());
 }
 startMcpServer(parseArgs(process.argv)).catch((err) => {