@rymi/mcp 2.2.0 → 2.4.0

package/README.md

@@ -63,7 +63,7 @@ Run the server on your own machine — it speaks **stdio** by default and talks
 }
 ```
 
-> **Options:** `RYMI_MCP_READONLY=1` hides every mutating tool (including `create_call`, `batch_call`, `publish_agent`).
+> **Options:** `RYMI_MCP_READONLY=1` hides every mutating tool (including `create_call`, `batch_call`, `publish_agent`). `RYMI_WORKSPACE` makes the local server act in that workspace (sent as the `Rymi-Workspace` header). On the hosted endpoint, send the `Rymi-Workspace` header on the HTTP request instead.
 >
 > This package speaks **stdio** only. `--transport http` was removed in 2.0.0 — use the hosted endpoint above, which the local server could never match on auth (it has no OAuth, and no per-key tool gating).
 
@@ -76,8 +76,8 @@ Run the server on your own machine — it speaks **stdio** by default and talks
 <td><code>list_agents</code> · <code>get_agent</code> · <code>create_agent</code> · <code>update_agent</code> · <code>delete_agent</code> · <code>clone_agent</code> · <code>apply_agent_changes</code> · <code>generate_agent_draft</code> · <code>enrich_company</code> · <code>validate_agent_publish</code> · <code>preview_stack</code> · <code>publish_agent</code></td>
 </tr>
 <tr>
-<td><b>API tools & secrets</b></td>
-<td><code>list_agent_tools</code> · <code>add_agent_tool</code> · <code>update_agent_tool</code> · <code>remove_agent_tool</code> · <code>list_tool_secrets</code> · <code>set_tool_secret</code></td>
+<td><b>Agent tools & secrets</b></td>
+<td><code>set_agent_tools</code> · <code>list_agent_tools</code> · <code>add_agent_tool</code> · <code>update_agent_tool</code> · <code>remove_agent_tool</code> · <code>list_tool_secrets</code> · <code>set_tool_secret</code></td>
 </tr>
 <tr>
 <td><b>Share link</b></td>
@@ -135,6 +135,10 @@ Run the server on your own machine — it speaks **stdio** by default and talks
 <td><b>Billing & cost</b></td>
 <td><code>estimate_call_cost</code> · <code>set_auto_recharge</code> · <code>set_spend_alerts</code></td>
 </tr>
+<tr>
+<td><b>Workspaces</b></td>
+<td><code>list_workspaces</code> · <code>create_workspace</code></td>
+</tr>
 </table>
 
 ### ⚠️ Gated tools

package/dist/index.js

@@ -34,6 +34,68 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// ../shared-types/dist/safeUrl.js
+var safeUrl_exports = {};
+__export(safeUrl_exports, {
+  isSafeUrl: () => isSafeUrl
+});
+function unmapIpv4(v6) {
+  const dotted = /^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.exec(v6);
+  if (dotted)
+    return dotted[1];
+  const hex = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(v6);
+  if (!hex)
+    return null;
+  const high = parseInt(hex[1], 16);
+  const low = parseInt(hex[2], 16);
+  return [high >> 8, high & 255, low >> 8, low & 255].join(".");
+}
+function isBlockedHost(host) {
+  const bare = host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
+  if (bare === "localhost" || bare === "0.0.0.0" || bare === "::")
+    return true;
+  if (bare.endsWith(".local") || bare.endsWith(".internal") || bare.endsWith(".localhost"))
+    return true;
+  if (/^127\./.test(bare))
+    return true;
+  if (/^10\./.test(bare))
+    return true;
+  if (/^192\.168\./.test(bare))
+    return true;
+  if (/^172\.(1[6-9]|2\d|3[01])\./.test(bare))
+    return true;
+  if (/^169\.254\./.test(bare))
+    return true;
+  const v6 = bare.toLowerCase();
+  if (v6 === "::1")
+    return true;
+  if (/^f[cd][0-9a-f]{2}:/.test(v6))
+    return true;
+  if (/^fe[89ab][0-9a-f]:/.test(v6))
+    return true;
+  const mapped = unmapIpv4(v6);
+  if (mapped)
+    return isBlockedHost(mapped);
+  return false;
+}
+function isSafeUrl(raw, options = {}) {
+  const protocols = options.protocols ?? ["http:", "https:"];
+  let url;
+  try {
+    url = new URL(raw);
+  } catch {
+    return false;
+  }
+  if (!protocols.includes(url.protocol))
+    return false;
+  return !isBlockedHost(url.hostname.toLowerCase());
+}
+var init_safeUrl = __esm({
+  "../shared-types/dist/safeUrl.js"() {
+    "use strict";
+  }
+});
+
 // ../shared-types/dist/agentTools.js
 var agentTools_exports = {};
 __export(agentTools_exports, {
@@ -43,9 +105,32 @@ __export(agentTools_exports, {
   API_TOOL_RESERVED_FIELD_NAMES: () => API_TOOL_RESERVED_FIELD_NAMES,
   API_TOOL_SECRET_REF_PATTERN: () => API_TOOL_SECRET_REF_PATTERN,
   BUILTIN_TOOL_CATALOG: () => BUILTIN_TOOL_CATALOG,
+  MCP_CONNECT_TIMEOUT_MS: () => MCP_CONNECT_TIMEOUT_MS,
+  MCP_SERVER_TOOL_ID: () => MCP_SERVER_TOOL_ID,
   SECRET_NAME_PATTERN: () => SECRET_NAME_PATTERN,
+  connectionStatus: () => connectionStatus,
+  isAgentToolEnabled: () => isAgentToolEnabled,
+  readMcpServerBinding: () => readMcpServerBinding,
   toToolCapabilitySafeView: () => toToolCapabilitySafeView
 });
+function readMcpServerBinding(binding) {
+  const raw = binding?.provider_settings ?? {};
+  const url = typeof raw.url === "string" ? raw.url.trim() : "";
+  if (!isSafeUrl(url, { protocols: ["https:"] }))
+    return null;
+  const allowlist = Array.isArray(raw.allowlist) ? [...new Set(raw.allowlist.filter((t) => typeof t === "string" && t.trim() !== "").map((t) => t.trim()))].slice(0, MAX_MCP_ALLOWLIST) : [];
+  if (allowlist.length === 0)
+    return null;
+  const headers = {};
+  if (raw.headers && typeof raw.headers === "object" && !Array.isArray(raw.headers)) {
+    for (const [key, value] of Object.entries(raw.headers)) {
+      if (key.trim() && typeof value === "string")
+        headers[key.trim()] = value;
+    }
+  }
+  const name = typeof raw.name === "string" && raw.name.trim() ? raw.name.trim() : new URL(url).hostname;
+  return { name, url, headers, allowlist };
+}
 function toToolCapabilitySafeView(state) {
   return {
     toolId: state.toolId,
@@ -54,10 +139,27 @@ function toToolCapabilitySafeView(state) {
     sideEffect: state.sideEffect
   };
 }
-var API_TOOL_NAME_PATTERN, SECRET_NAME_PATTERN, API_SECRETS_PROVIDER, API_TOOL_RESERVED_FIELD_NAMES, API_TOOL_AUTH_HEADER_PATTERN, API_TOOL_SECRET_REF_PATTERN, BUILTIN_TOOL_CATALOG;
+function isAgentToolEnabled(bindings, defaultOn) {
+  if (bindings?.some((binding) => binding.enabled === true))
+    return true;
+  if (bindings?.some((binding) => binding.enabled === false))
+    return false;
+  return defaultOn;
+}
+function connectionStatus(row) {
+  if (row.is_active === false)
+    return "error";
+  const creds = row.credentials || {};
+  const hasRefreshToken = typeof creds.refresh_token === "string" && creds.refresh_token.trim().length > 0;
+  const expiresAt = typeof creds.expires_at === "string" ? new Date(creds.expires_at) : null;
+  const accessTokenExpired = expiresAt && !isNaN(expiresAt.getTime()) && expiresAt.getTime() < Date.now();
+  return accessTokenExpired && !hasRefreshToken ? "expired" : "connected";
+}
+var API_TOOL_NAME_PATTERN, SECRET_NAME_PATTERN, API_SECRETS_PROVIDER, API_TOOL_RESERVED_FIELD_NAMES, API_TOOL_AUTH_HEADER_PATTERN, API_TOOL_SECRET_REF_PATTERN, MCP_SERVER_TOOL_ID, MCP_CONNECT_TIMEOUT_MS, MAX_MCP_ALLOWLIST, BUILTIN_TOOL_CATALOG;
 var init_agentTools = __esm({
   "../shared-types/dist/agentTools.js"() {
     "use strict";
+    init_safeUrl();
     API_TOOL_NAME_PATTERN = /^[a-z][a-z0-9_]{2,40}$/;
     SECRET_NAME_PATTERN = /^[A-Z][A-Z0-9_]{1,63}$/;
     API_SECRETS_PROVIDER = "api_secrets";
@@ -101,6 +203,9 @@ var init_agentTools = __esm({
     ]);
     API_TOOL_AUTH_HEADER_PATTERN = /^(authorization|x-api-key|api[-_]?key|.*token.*|.*secret.*)$/i;
     API_TOOL_SECRET_REF_PATTERN = /\{\{\s*secrets\.[A-Z][A-Z0-9_]{1,63}\s*\}\}/;
+    MCP_SERVER_TOOL_ID = "mcp_server";
+    MCP_CONNECT_TIMEOUT_MS = 3e3;
+    MAX_MCP_ALLOWLIST = 50;
     BUILTIN_TOOL_CATALOG = [
       {
         tool_id: "handoff_to_human",
@@ -111,6 +216,15 @@ var init_agentTools = __esm({
         default_timeout_ms: 1e3,
         requires_credential: false
       },
+      {
+        tool_id: "schedule_callback",
+        label: "Scheduled callbacks",
+        description: "Let the agent schedule a call back to the caller at a time they choose, and place it itself at that time (Indian mobile numbers, 9 am to 9 pm IST). Needs a phone number attached to the agent or the workspace; no calendar or messaging connection is required.",
+        category: "call_control",
+        side_effect: "write",
+        default_timeout_ms: 4e3,
+        requires_credential: false
+      },
       {
         tool_id: "check_calendar_availability",
         label: "Check calendar availability",
@@ -220,73 +334,20 @@ var init_agentTools = __esm({
         // The endpoint lives in the binding's provider_settings and its secrets in
         // the tenant's api_secrets row — nothing to connect in Settings → Connectors.
         requires_credential: false
+      },
+      {
+        tool_id: "mcp_server",
+        label: "MCP server",
+        description: "Give the agent tools from your own MCP server. Only the tools you allowlist are offered; header secrets stay encrypted and are sent only to that server.",
+        category: "webhook",
+        side_effect: "write",
+        default_timeout_ms: MCP_CONNECT_TIMEOUT_MS,
+        requires_credential: false
       }
     ];
   }
 });
 
-// ../shared-types/dist/safeUrl.js
-var safeUrl_exports = {};
-__export(safeUrl_exports, {
-  isSafeUrl: () => isSafeUrl
-});
-function unmapIpv4(v6) {
-  const dotted = /^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.exec(v6);
-  if (dotted)
-    return dotted[1];
-  const hex = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(v6);
-  if (!hex)
-    return null;
-  const high = parseInt(hex[1], 16);
-  const low = parseInt(hex[2], 16);
-  return [high >> 8, high & 255, low >> 8, low & 255].join(".");
-}
-function isBlockedHost(host) {
-  const bare = host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
-  if (bare === "localhost" || bare === "0.0.0.0" || bare === "::")
-    return true;
-  if (bare.endsWith(".local") || bare.endsWith(".internal") || bare.endsWith(".localhost"))
-    return true;
-  if (/^127\./.test(bare))
-    return true;
-  if (/^10\./.test(bare))
-    return true;
-  if (/^192\.168\./.test(bare))
-    return true;
-  if (/^172\.(1[6-9]|2\d|3[01])\./.test(bare))
-    return true;
-  if (/^169\.254\./.test(bare))
-    return true;
-  const v6 = bare.toLowerCase();
-  if (v6 === "::1")
-    return true;
-  if (/^f[cd][0-9a-f]{2}:/.test(v6))
-    return true;
-  if (/^fe[89ab][0-9a-f]:/.test(v6))
-    return true;
-  const mapped = unmapIpv4(v6);
-  if (mapped)
-    return isBlockedHost(mapped);
-  return false;
-}
-function isSafeUrl(raw, options = {}) {
-  const protocols = options.protocols ?? ["http:", "https:"];
-  let url;
-  try {
-    url = new URL(raw);
-  } catch {
-    return false;
-  }
-  if (!protocols.includes(url.protocol))
-    return false;
-  return !isBlockedHost(url.hostname.toLowerCase());
-}
-var init_safeUrl = __esm({
-  "../shared-types/dist/safeUrl.js"() {
-    "use strict";
-  }
-});
-
 // ../ops-tools/dist/index.js
 var require_dist = __commonJS({
   "../ops-tools/dist/index.js"(exports2, module2) {
@@ -1270,7 +1331,7 @@ var require_dist = __commonJS({
     ];
     var import_zod11 = require("zod");
     var import_agentTools = (init_agentTools(), __toCommonJS(agentTools_exports));
-    var import_safeUrl = (init_safeUrl(), __toCommonJS(safeUrl_exports));
+    var import_safeUrl2 = (init_safeUrl(), __toCommonJS(safeUrl_exports));
     var DEFAULT_NAME = "call_webhook";
     var METHODS = ["GET", "POST", "PUT", "PATCH"];
     var FIELD_NAME = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
@@ -1308,7 +1369,7 @@ var require_dist = __commonJS({
       const url = typeof s.url === "string" ? s.url.trim() : "";
       if (!url) errors.push("url is required.");
       else if (!/^https:\/\//i.test(url)) errors.push("url must be https \u2014 the request carries caller details.");
-      else if (!(0, import_safeUrl.isSafeUrl)(url, { protocols: ["https:"] })) errors.push("url must be a valid public host; private and loopback addresses are refused at call time.");
+      else if (!(0, import_safeUrl2.isSafeUrl)(url, { protocols: ["https:"] })) errors.push("url must be a valid public host; private and loopback addresses are refused at call time.");
       if (!METHODS.includes(s.method)) errors.push(`method must be one of ${METHODS.join(", ")}.`);
       if (!Number.isInteger(b.timeout_ms) || b.timeout_ms < 1e3 || b.timeout_ms > 1e4) errors.push("timeout_ms must be an integer from 1000 to 10000.");
       const seen = /* @__PURE__ */ new Set();
@@ -1351,6 +1412,49 @@ var require_dist = __commonJS({
       }
       return found;
     }
+    var ALWAYS_ON_TOOL_IDS = ["datetime_now", "knowledge_search", "end_call", "get_caller_history", "forget_me"];
+    var SWITCHABLE_CATALOG = import_agentTools.BUILTIN_TOOL_CATALOG.filter((t) => t.tool_id !== "call_webhook" && t.tool_id !== "mcp_server");
+    var TOOL_GROUPS = {
+      calendar: [
+        "check_calendar_availability",
+        "list_calendar_events",
+        "create_calendar_event",
+        "update_calendar_event",
+        "delete_calendar_event"
+      ],
+      tickets: ["lookup_ticket", "create_ticket"]
+    };
+    var SWITCHABLE_IDS = [...ALWAYS_ON_TOOL_IDS, ...SWITCHABLE_CATALOG.map((t) => t.tool_id)];
+    function expandToolIds(requested) {
+      const ids = /* @__PURE__ */ new Set();
+      const unknown = [];
+      for (const raw of requested) {
+        const name = raw.trim();
+        if (TOOL_GROUPS[name]) TOOL_GROUPS[name].forEach((id) => ids.add(id));
+        else if (SWITCHABLE_IDS.includes(name)) ids.add(name);
+        else unknown.push(name);
+      }
+      if (unknown.length) {
+        throw new Error(`Unknown tool ${unknown.map((u) => `"${u}"`).join(", ")}. Use one of: ${[...Object.keys(TOOL_GROUPS), ...SWITCHABLE_IDS].join(", ")}. API tools use add/update/remove_agent_tool.`);
+      }
+      return [...ids];
+    }
+    function setToolsEnabled(tools, toolIds, enabled) {
+      const next = tools.map((t) => toolIds.includes(t.tool_id) ? { ...t, enabled } : t);
+      for (const toolId of toolIds) {
+        if (next.some((t) => t.tool_id === toolId)) continue;
+        const entry = SWITCHABLE_CATALOG.find((t) => t.tool_id === toolId);
+        next.push({
+          tool_id: toolId,
+          enabled,
+          credential_ref: null,
+          timeout_ms: entry?.default_timeout_ms ?? 3e3,
+          side_effect: entry?.side_effect ?? (toolId === "end_call" || toolId === "forget_me" ? "write" : "read"),
+          provider_settings: {}
+        });
+      }
+      return next;
+    }
     var addShape = { agent_id: import_zod11.z.string().describe("The agent UUID"), name: import_zod11.z.string().describe('LLM-facing tool name, e.g. "lookup_reservation". Unique per agent.'), ...settingsShape };
     var updateShape = {
       agent_id: import_zod11.z.string().describe("The agent UUID"),
@@ -1458,6 +1562,22 @@ var require_dist = __commonJS({
           return { status: "removed", agent_id: agentId, name, remaining: tools.filter(isApiTool).map(bindingName), note: LIVE_NOTE };
         }
       }),
+      defineTool({
+        name: "set_agent_tools",
+        description: `Switch built-in tools on or off for one agent: calendar (check/list/create/update/delete), lookup_customer, lookup_ticket/create_ticket, send_whatsapp_message, send_telegram_message, send_asset, handoff_to_human, schedule_callback, and the always-on ones (end_call, forget_me, knowledge_search, get_caller_history, datetime_now). Groups: "calendar" (all five calendar tools), "tickets". Connected-app tools are opt-in per agent: connecting the app for the workspace makes them available, and an agent gets one only when switched on here or in Studio; it also needs the app connected (Settings \u2192 Connectors) to work on calls. Other agents are not affected. ${LIVE_NOTE}`,
+        scope: "agent",
+        risk: "write",
+        input: {
+          agent_id: import_zod11.z.string().describe("The agent UUID"),
+          tools: import_zod11.z.array(import_zod11.z.string()).min(1).describe('Tool ids or groups, e.g. ["calendar"] or ["send_whatsapp_message", "send_asset"].'),
+          enabled: import_zod11.z.boolean().describe("true switches them on for this agent, false switches them off.")
+        },
+        run: async (client, { agent_id, tools: requested, enabled }) => {
+          const toolIds = expandToolIds(requested);
+          const { agentId } = await writeTools(client, agent_id, (tools) => setToolsEnabled(tools, toolIds, enabled));
+          return { status: enabled ? "enabled" : "disabled", agent_id: agentId, tools: toolIds, note: LIVE_NOTE };
+        }
+      }),
       defineTool({
         name: "list_tool_secrets",
         description: "List the workspace's API-tool secret names and the host each is pinned to. Values are never returned.",
@@ -1517,6 +1637,28 @@ var require_dist = __commonJS({
         run: (client, { agent_id }) => client.agents.regenerateShareLink(agent_id)
       })
     ];
+    var import_zod13 = require("zod");
+    var workspaceTools = [
+      defineTool({
+        name: "list_workspaces",
+        description: "List the workspaces this credential can act in, marking the current one. Act in another by setting RYMI_WORKSPACE (local MCP) or the Rymi-Workspace header.",
+        scope: "account",
+        risk: "read",
+        input: {},
+        run: (client) => client.workspaces.list()
+      }),
+      defineTool({
+        name: "create_workspace",
+        description: "Create a standalone workspace you own, with its own agents, numbers, keys and balance. It gets no free monthly credit.",
+        scope: "account",
+        risk: "write",
+        input: {
+          name: import_zod13.z.string().min(1).max(80).describe("Workspace name"),
+          operating_country: import_zod13.z.string().length(2).optional().describe('ISO-3166 alpha-2 country, e.g. "IN"')
+        },
+        run: (client, params) => client.workspaces.create(params)
+      })
+    ];
     var import_agentTools2 = (init_agentTools(), __toCommonJS(agentTools_exports));
     var REDACTED = "[redacted]";
     function redactToolSecrets(value) {
@@ -1550,7 +1692,8 @@ var require_dist = __commonJS({
       ...webhookTools,
       ...billingTools,
       ...campaignTools,
-      ...shareLinkTools
+      ...shareLinkTools,
+      ...workspaceTools
     ].map((t) => ({ ...t, run: async (client, params) => redactToolSecrets(await t.run(client, params)) }));
     var names = /* @__PURE__ */ new Set();
     for (const tool of opsToolCatalog2) {
@@ -1586,7 +1729,7 @@ function withToolErrors(handler) {
 // package.json
 var package_default = {
   name: "@rymi/mcp",
-  version: "2.2.0",
+  version: "2.4.0",
   description: "Rymi MCP server \u2014 manage AI voice agents via Model Context Protocol",
   license: "MIT",
   author: "Rymi AI <engineering@rymi.live>",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rymi/mcp",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Rymi MCP server — manage AI voice agents via Model Context Protocol",
   "license": "MIT",
   "author": "Rymi AI <engineering@rymi.live>",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.11.1",
-    "@rymi/node": "^2.2.0",
+    "@rymi/node": "^2.3.0",
     "zod": "^3.23.0"
   },
   "devDependencies": {