@skilder-ai/runtime 0.8.5 → 0.8.7

package/dist/index.js

@@ -138096,10 +138096,10 @@ var SkillCallToolRequest = class extends NatsRequest {
     return `*.${type9}.>`;
   }
   /**
-   * Subscribe to a specific static tool by name
+   * Subscribe to a specific static tool by name, scoped to a workspace.
    */
-  static subscribeToStaticTool(toolName) {
-    return `*.${type9}.static.${toolName}.*`;
+  static subscribeToStaticTool(toolName, workspaceId) {
+    return `${workspaceId}.${type9}.static.${toolName}.*`;
   }
   /**
    * Subscribe to all script execution calls
@@ -138108,20 +138108,21 @@ var SkillCallToolRequest = class extends NatsRequest {
     return `*.${type9}.script.>`;
   }
   /**
-   * Subscribe to a specific script by ID
+   * Subscribe to a specific script by ID, scoped to a workspace.
    */
-  static subscribeToScript(scriptId) {
-    return `*.${type9}.script.${scriptId}.*.*`;
+  static subscribeToScript(scriptId, workspaceId) {
+    return `${workspaceId}.${type9}.script.${scriptId}.*.*`;
   }
   /**
-   * Subscribe to all script execution calls for a specific runtime
+   * Subscribe to all script execution calls for a specific runtime, scoped to a workspace.
    * Format: {workspaceId}.call-tool.script.{scriptId}.{targetRuntimeId}.{from}
+   * When workspaceId is empty (system runtimes that are cross-workspace), uses a wildcard.
    */
-  static subscribeToScriptsForRuntime(runtimeId) {
-    return `*.${type9}.script.*.${runtimeId}.*`;
+  static subscribeToScriptsForRuntime(runtimeId, workspaceId) {
+    return workspaceId ? `${workspaceId}.${type9}.script.*.${runtimeId}.*` : `*.${type9}.script.*.${runtimeId}.*`;
   }
-  static subscribeToTool(toolId) {
-    return `*.${type9}.${toolId}.*`;
+  static subscribeToTool(toolId, workspaceId) {
+    return `${workspaceId}.${type9}.${toolId}.*`;
   }
   static subscribeToToolOnOneRuntime(toolId, workspaceId, runtimeId) {
     return `${workspaceId}.${type9}.${toolId}.${runtimeId}`;
@@ -153069,7 +153070,7 @@ var RuntimeBusService = class RuntimeBusService2 {
       return;
     }
     for (const runtimeId of toSubscribe) {
-      this.subscribeRuntime(runtimeId);
+      this.subscribeRuntime(runtimeId, workspaceId);
     }
   }
   async drain() {
@@ -153086,10 +153087,10 @@ var RuntimeBusService = class RuntimeBusService2 {
   }
   /** Subscribe a single runtimeId. If the handler exits, drop from observed so the next
    * syncSubscriptions() resubscribes (no exponential-backoff resurrection). */
-  subscribeRuntime(runtimeId) {
+  subscribeRuntime(runtimeId, workspaceId) {
     if (!this.natsService || !this.onMessage)
       return;
-    const subject = SkillCallToolRequest.subscribeToScriptsForRuntime(runtimeId);
+    const subject = SkillCallToolRequest.subscribeToScriptsForRuntime(runtimeId, workspaceId);
     const subscription = this.natsService.subscribe(subject);
     this.observed.set(runtimeId, { unsubscribe: () => subscription.unsubscribe() });
     Promise.resolve(this.onMessage(subscription)).catch((err) => {
@@ -153654,8 +153655,8 @@ var ToolService = class ToolService2 extends Service {
     }
   }
   // Subscribe to a tool and return the subscription
-  subscribeToTool(tool2) {
-    const subject = SkillCallToolRequest.subscribeToTool(tool2.id);
+  subscribeToTool(tool2, workspaceId) {
+    const subject = SkillCallToolRequest.subscribeToTool(tool2.id, workspaceId);
     this.logger.debug(`Subscribing to tool ${tool2.id} on subject: ${subject}`);
     const subscription = this.natsService.subscribe(subject);
     this.handleToolCall(subscription).catch((err) => {
@@ -154380,6 +154381,11 @@ ${cleanError}` : cleanError;
    */
   ensureToolsSubscribed(mcpServerId, tools) {
     this.mcpTools.set(mcpServerId, tools.filter((tool2) => !!tool2));
+    const workspaceId = this.mcpServerWorkspaces.get(mcpServerId);
+    if (!workspaceId) {
+      this.logger.warn({ event: "tool_subscribe_no_workspace", mcpServerId }, "Cannot subscribe to tools: workspace not registered for MCP server");
+      return;
+    }
     if (!this.toolSubscriptions.has(mcpServerId)) {
       this.toolSubscriptions.set(mcpServerId, /* @__PURE__ */ new Map());
     }
@@ -154387,7 +154393,7 @@ ${cleanError}` : cleanError;
     for (const tool2 of tools) {
       if (tool2 && !serverToolSubs.has(tool2.id)) {
         this.logger.debug(`Subscribing to tool ${tool2.name} (${tool2.id})`);
-        const subscription = this.subscribeToTool(tool2);
+        const subscription = this.subscribeToTool(tool2, workspaceId);
         serverToolSubs.set(tool2.id, subscription);
       } else if (tool2) {
         this.logger.debug(`Tool ${tool2.name} (${tool2.id}) already subscribed -> skipping`);