shadow-claw 1.28.0 → 1.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shadow-claw",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "type": "module",
   "license": "AGPL-3.0",
   "description": "Browser-native personal AI assistant.",

package/src/components/settings/shadow-claw-llm/shadow-claw-llm.test.ts

@@ -58,6 +58,8 @@ jest.unstable_mockModule("../../../config/config.js", () => ({
     TRANSFORMERS_JS_DTYPE_STRATEGY: "transformers_js_dtype_strategy",
   },
   DEFAULT_MAX_ITERATIONS: 50,
+  DEFAULT_CONTROL_PLANE_ENABLED: false,
+  DEFAULT_CONTROL_PLANE_TRANSPORT: "http",
   DEFAULT_SUBAGENT_MAX_PARALLEL: 5,
   DEFAULT_SUBAGENT_WORKSPACE_MODE: "automatic",
   DEFAULT_PROMPT_API_FALLBACK_MODEL: "onnx-community/Qwen3-0.6B-ONNX",

package/src/core/orchestrator/utils/configurePeerJs.test.ts

@@ -60,6 +60,8 @@ const mockConfig = {
   getModelMaxTokens: jest.fn().mockReturnValue(128000),
   buildTriggerPattern: jest.fn().mockReturnValue(new RegExp("")),
   DEFAULT_GROUP_ID: "br:main",
+  DEFAULT_CONTROL_PLANE_ENABLED: false,
+  DEFAULT_CONTROL_PLANE_TRANSPORT: "http",
   OPFS_ROOT: "shadowclaw",
   LLAMAFILE_PROXY_URL: "/proxy/llamafile",
 };

package/src/server/client-registry.test.ts

@@ -14,6 +14,7 @@ import {
   getControlTokenFilePath,
 } from "./client-registry.js";
 import fs from "node:fs";
+import { tmpdir } from "node:os";
 import path from "node:path";
 
 beforeEach(() => {
@@ -246,5 +247,13 @@ describe("client-registry", () => {
       expect(rawJson.token).toBe("my-secret-test-token");
       expect(rawJson.createdAt).toBe(1700000000000);
     });
+
+    it("mirrors saved token to system tmp directory", () => {
+      saveControlTokenFile("tmp-mirrored-token", tempCacheDir, 1700000000000);
+      const tmpFile = path.join(tmpdir(), "shadow-claw", "control-token.json");
+      expect(fs.existsSync(tmpFile)).toBe(true);
+      const content = JSON.parse(fs.readFileSync(tmpFile, "utf8"));
+      expect(content.token).toBe("tmp-mirrored-token");
+    });
   });
 });

package/src/server/client-registry.ts

@@ -7,6 +7,7 @@
 
 import { randomBytes } from "node:crypto";
 import fs from "node:fs";
+import { tmpdir } from "node:os";
 import path from "node:path";
 import { DatabaseSync } from "node:sqlite";
 import type { ClientInfo, BackupRecord } from "./control-plane-types.js";
@@ -281,6 +282,19 @@ export function saveControlTokenFile(
     fs.writeFileSync(filePath, JSON.stringify(payload, null, 2) + "\n", "utf8");
   } catch (_) {}
 
+  // Mirror to system tmp directory so CLI commands run from any working directory can locate it
+  try {
+    const tmpCacheDir = path.join(tmpdir(), "shadow-claw");
+    if (!fs.existsSync(tmpCacheDir)) {
+      fs.mkdirSync(tmpCacheDir, { recursive: true });
+    }
+    fs.writeFileSync(
+      path.join(tmpCacheDir, "control-token.json"),
+      JSON.stringify(payload, null, 2) + "\n",
+      "utf8",
+    );
+  } catch (_) {}
+
   return payload;
 }
 

package/src/server/mcp/mcp-integration.test.ts

@@ -239,17 +239,18 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
     const toolNames = res.body.result.tools.map((t: any) => t.name);
 
     // Built-in tools
-    expect(toolNames).toContain("shadowclaw_list_clients");
-    expect(toolNames).toContain("shadowclaw_send_message");
-    expect(toolNames).toContain("shadowclaw_read_state");
-    expect(toolNames).toContain("shadowclaw_list_tasks");
+    expect(toolNames).toContain("shadowclaw_server_list_clients");
+    expect(toolNames).toContain("shadowclaw_server_send_message");
+    expect(toolNames).toContain("shadowclaw_server_read_state");
+    expect(toolNames).toContain("shadowclaw_server_list_tasks");
 
     // Relayed browser tools
-    expect(toolNames).toContain("read_file");
-    expect(toolNames).toContain("workspace_status");
+    expect(toolNames).toContain("shadowclaw_client_read_file");
+    expect(toolNames).toContain("shadowclaw_client_workspace_status");
+    expect(toolNames).toContain("shadowclaw_client_ask_user");
   });
 
-  it("calls built-in tool shadowclaw_read_state and returns browser state", async () => {
+  it("calls built-in tool shadowclaw_server_read_state and returns browser state", async () => {
     const res = await postMcp(
       port,
       token,
@@ -258,11 +259,14 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
         id: 3,
         method: "tools/call",
         params: {
-          name: "shadowclaw_read_state",
+          name: "shadowclaw_server_read_state",
           arguments: { clientId: "test-browser-client-e2e" },
         },
       },
-      { "mcp-method": "tools/call", "mcp-name": "shadowclaw_read_state" },
+      {
+        "mcp-method": "tools/call",
+        "mcp-name": "shadowclaw_server_read_state",
+      },
     );
 
     expect(res.status).toBe(200);
@@ -270,9 +274,28 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
     const content = res.body.result.content[0].text;
     expect(content).toContain("br:main");
     expect(content).toContain("claude-3-5-sonnet");
+
+    // Calling via legacy alias shadowclaw_read_state also succeeds
+    const resAlias = await postMcp(
+      port,
+      token,
+      {
+        jsonrpc: "2.0",
+        id: 31,
+        method: "tools/call",
+        params: {
+          name: "shadowclaw_read_state",
+          arguments: { clientId: "test-browser-client-e2e" },
+        },
+      },
+      { "mcp-method": "tools/call", "mcp-name": "shadowclaw_read_state" },
+    );
+    expect(resAlias.status).toBe(200);
+    expect(resAlias.body.result.resultType).toBe("complete");
+    expect(resAlias.body.result.content[0].text).toContain("br:main");
   });
 
-  it("calls relayed browser tool read_file across Control Plane and receives response", async () => {
+  it("calls relayed browser tool shadowclaw_client_read_file across Control Plane and receives response", async () => {
     const res = await postMcp(
       port,
       token,
@@ -281,11 +304,14 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
         id: 4,
         method: "tools/call",
         params: {
-          name: "read_file",
+          name: "shadowclaw_client_read_file",
           arguments: { path: "src/main.ts" },
         },
       },
-      { "mcp-method": "tools/call", "mcp-name": "read_file" },
+      {
+        "mcp-method": "tools/call",
+        "mcp-name": "shadowclaw_client_read_file",
+      },
     );
 
     expect(res.status).toBe(200);
@@ -295,6 +321,26 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
     expect(text).toContain(
       "Content of file src/main.ts: Hello from Browser OPFS!",
     );
+
+    // Also verify backward compatibility: calling with unprefixed name also proxies
+    const resUnprefixed = await postMcp(
+      port,
+      token,
+      {
+        jsonrpc: "2.0",
+        id: 41,
+        method: "tools/call",
+        params: {
+          name: "read_file",
+          arguments: { path: "src/main.ts" },
+        },
+      },
+      { "mcp-method": "tools/call", "mcp-name": "read_file" },
+    );
+    expect(resUnprefixed.status).toBe(200);
+    expect(resUnprefixed.body.result.content[0].text).toContain(
+      "Content of file src/main.ts: Hello from Browser OPFS!",
+    );
   });
 
   it("handles MRTR interactive flow for ask_user tool", async () => {
@@ -307,11 +353,14 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
         id: 5,
         method: "tools/call",
         params: {
-          name: "ask_user",
+          name: "shadowclaw_client_ask_user",
           arguments: { question: "Are you ready?" },
         },
       },
-      { "mcp-method": "tools/call", "mcp-name": "ask_user" },
+      {
+        "mcp-method": "tools/call",
+        "mcp-name": "shadowclaw_client_ask_user",
+      },
     );
 
     expect(res1.status).toBe(200);
@@ -328,12 +377,15 @@ describe("End-to-End MCP Server & Control Plane Relay", () => {
         id: 6,
         method: "tools/call",
         params: {
-          name: "ask_user",
+          name: "shadowclaw_client_ask_user",
           arguments: { question: "Are you ready?" },
           inputResponses: { response: "Yes, ready to proceed!" },
         },
       },
-      { "mcp-method": "tools/call", "mcp-name": "ask_user" },
+      {
+        "mcp-method": "tools/call",
+        "mcp-name": "shadowclaw_client_ask_user",
+      },
     );
 
     expect(res2.status).toBe(200);

package/src/server/mcp/tools/built-in-tools.ts

@@ -7,12 +7,100 @@
 
 import type { McpServer } from "../mcp-server.js";
 import type { McpTool } from "../types.js";
-import { broadcastPush } from "../../../subsystems/notifications/push-routes.js";
+import {
+  broadcastPush,
+  getRegisteredPushClients,
+  type PushClientRecord,
+} from "../../../subsystems/notifications/push-routes.js";
 import { getPackageVersion } from "../../utils/packageVersion.js";
 
+export function buildSendNotificationTool(
+  pushClients: Array<
+    PushClientRecord | { clientId: string; deviceLabel?: string }
+  > = [],
+  name: string = "shadowclaw_server_send_notification",
+): McpTool {
+  const sortedPushClients = [...pushClients].sort((a, b) =>
+    a.clientId.localeCompare(b.clientId),
+  );
+  const pushClientIds = sortedPushClients
+    .map((c) => c.clientId)
+    .filter(Boolean);
+
+  const baseDescription =
+    "Broadcast an OS-level push notification to subscribed devices via Web Push (VAPID), or send to a specific registered client. Works even when the client browser tab is closed, asleep, or running in the background.";
+
+  const clientIdProp: any = {
+    type: "string",
+    description:
+      pushClientIds.length > 0
+        ? `Target client ID, prefix, or device label of a specific client registered for push notifications (optional; if omitted, broadcasts to all subscribed devices). Available on: ${sortedPushClients.map((c) => `${c.clientId} (${c.deviceLabel || "Client"})`).join(", ")}`
+        : "Target client ID, prefix, or device label of a specific client that has registered in the past. If omitted, broadcasts to all subscribed devices.",
+  };
+
+  if (pushClientIds.length > 0) {
+    clientIdProp.enum = pushClientIds;
+  }
+
+  return {
+    name,
+    description: baseDescription,
+    inputSchema: {
+      type: "object",
+      properties: {
+        title: {
+          type: "string",
+          description: "Notification title (default: 'ShadowClaw').",
+        },
+        body: {
+          type: "string",
+          description: "Notification body message text.",
+        },
+        clientId: clientIdProp,
+      },
+      required: ["body"],
+    },
+  };
+}
+
+export function getDynamicSendNotificationTool(
+  controlPlane?: any,
+  name: string = "shadowclaw_server_send_notification",
+): McpTool {
+  let pushClients: PushClientRecord[] = [];
+  try {
+    pushClients = getRegisteredPushClients();
+  } catch (_) {}
+
+  if (controlPlane && Array.isArray(pushClients) && pushClients.length > 0) {
+    try {
+      const connected =
+        typeof controlPlane.getConnectedClients === "function"
+          ? controlPlane.getConnectedClients()
+          : typeof controlPlane.listClients === "function"
+            ? controlPlane.listClients()
+            : [];
+      if (Array.isArray(connected)) {
+        for (const pc of pushClients) {
+          if (!pc.deviceLabel) {
+            const match = connected.find(
+              (c: any) => (c.clientId || c.id) === pc.clientId,
+            );
+            if (match && match.deviceLabel) {
+              pc.deviceLabel = match.deviceLabel;
+            }
+          }
+        }
+      }
+    } catch (_) {}
+  }
+
+  return buildSendNotificationTool(pushClients, name);
+}
+
 export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
   {
-    name: "shadowclaw_list_clients",
+    name: "shadowclaw_server_list_clients",
     description:
       "List connected browser and Electron clients, including device type, ID, and active capabilities.",
     inputSchema: {
@@ -21,7 +109,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
     },
   },
   {
-    name: "shadowclaw_send_message",
+    name: "shadowclaw_server_send_message",
     description:
       "Send a message or prompt to a connected ShadowClaw client's active AI orchestrator queue.",
     inputSchema: {
@@ -46,7 +134,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
     },
   },
   {
-    name: "shadowclaw_read_state",
+    name: "shadowclaw_server_read_state",
     description:
       "Read the current orchestrator state (idle, responding, etc.), active group ID, and capabilities from a connected client.",
     inputSchema: {
@@ -61,7 +149,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
     },
   },
   {
-    name: "shadowclaw_list_tasks",
+    name: "shadowclaw_server_list_tasks",
     description:
       "List scheduled background tasks configured on a connected client (optionally filtered by conversation group).",
     inputSchema: {
@@ -80,7 +168,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
     },
   },
   {
-    name: "shadowclaw_manage_backup",
+    name: "shadowclaw_server_manage_backup",
     description:
       "Trigger or manage OPFS workspace file backups for a connected client (trigger, list, or delete).",
     inputSchema: {
@@ -108,7 +196,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
     },
   },
   {
-    name: "shadowclaw_set_active_client",
+    name: "shadowclaw_server_set_active_client",
     description:
       "Set the active default connected client used when no clientId is explicitly provided in tool calls.",
     inputSchema: {
@@ -132,30 +220,7 @@ export const SHADOWCLAW_BUILTIN_TOOLS: McpTool[] = [
       properties: {},
     },
   },
-  {
-    name: "shadowclaw_send_notification",
-    description:
-      "Broadcast an OS-level push notification to subscribed devices via Web Push (VAPID), or send to a specific registered client. Works even when the client browser tab is closed, asleep, or running in the background.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        title: {
-          type: "string",
-          description: "Notification title (default: 'ShadowClaw').",
-        },
-        body: {
-          type: "string",
-          description: "Notification body message text.",
-        },
-        clientId: {
-          type: "string",
-          description:
-            "Target client ID, prefix, or device label of a specific client that has registered in the past. If omitted, broadcasts to all subscribed devices.",
-        },
-      },
-      required: ["body"],
-    },
-  },
+  buildSendNotificationTool(),
 ];
 
 export function resolveTargetClientId(
@@ -214,9 +279,14 @@ export function registerBuiltInTools(
   server: McpServer,
   controlPlane: any,
 ): void {
+  server.setToolProvider(async () => {
+    return [getDynamicSendNotificationTool(controlPlane)];
+  });
+
   for (const tool of SHADOWCLAW_BUILTIN_TOOLS) {
-    server.registerTool(tool, async (args) => {
+    const handler = async (args: Record<string, any>) => {
       switch (tool.name) {
+        case "shadowclaw_server_list_clients":
         case "shadowclaw_list_clients": {
           const clients =
             typeof controlPlane.getConnectedClients === "function"
@@ -235,6 +305,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_send_message":
         case "shadowclaw_send_message": {
           const text = String(args.text || "").trim();
           if (!text) {
@@ -278,6 +349,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_read_state":
         case "shadowclaw_read_state": {
           const targetId = resolveTargetClientId(controlPlane, args.clientId);
           if (!targetId) {
@@ -308,6 +380,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_list_tasks":
         case "shadowclaw_list_tasks": {
           const targetId = resolveTargetClientId(controlPlane, args.clientId);
           if (!targetId) {
@@ -337,6 +410,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_manage_backup":
         case "shadowclaw_manage_backup": {
           const action = String(args.action || "trigger").toLowerCase();
           const targetId = resolveTargetClientId(controlPlane, args.clientId);
@@ -426,6 +500,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_set_active_client":
         case "shadowclaw_set_active_client": {
           const targetId = resolveTargetClientId(controlPlane, args.clientId);
           if (!targetId) {
@@ -457,7 +532,8 @@ export function registerBuiltInTools(
           };
         }
 
-        case "shadowclaw_server_status": {
+        case "shadowclaw_server_status":
+        case "shadowclaw_status": {
           const clients =
             typeof controlPlane.getConnectedClients === "function"
               ? controlPlane.getConnectedClients()
@@ -482,6 +558,7 @@ export function registerBuiltInTools(
           };
         }
 
+        case "shadowclaw_server_send_notification":
         case "shadowclaw_send_notification":
         case "send_notification": {
           const body = String(args.body || "").trim();
@@ -549,6 +626,20 @@ export function registerBuiltInTools(
             content: [{ type: "text", text: `Unknown tool: '${tool.name}'` }],
           };
       }
-    });
+    };
+
+    server.registerTool(tool, handler);
+
+    if (tool.name.startsWith("shadowclaw_server_")) {
+      const legacyAlias = `shadowclaw_${tool.name.slice("shadowclaw_server_".length)}`;
+      server.registerToolHandler(legacyAlias, handler);
+    }
+    if (
+      tool.name === "shadowclaw_server_send_notification" ||
+      tool.name === "shadowclaw_send_notification"
+    ) {
+      server.registerToolHandler("shadowclaw_send_notification", handler);
+      server.registerToolHandler("send_notification", handler);
+    }
   }
 }