@skilder-ai/runtime 0.7.2 → 0.7.3

package/dist/index.js

@@ -137966,7 +137966,7 @@ var RuntimeCallToolResponse = class extends NatsResponse {
     this.type = type7;
   }
   validate(data) {
-    return data.result !== void 0 && data.executedByIdOrAgent !== void 0;
+    return data.result !== void 0 && data.executedBy !== void 0;
   }
 };
 NatsMessage.register(RuntimeCallToolResponse);
@@ -138347,7 +138347,6 @@ __export(dgraph_resolvers_types_exports, {
   OAuthProviderType: () => OAuthProviderType,
   OnboardingStepStatus: () => OnboardingStepStatus,
   OnboardingStepType: () => OnboardingStepType,
-  RuntimeType: () => RuntimeType,
   ScriptType: () => ScriptType,
   ToolCallStatus: () => ToolCallStatus,
   WorkspaceRole: () => WorkspaceRole
@@ -138443,11 +138442,6 @@ var OnboardingStepType = /* @__PURE__ */ ((OnboardingStepType2) => {
   OnboardingStepType2["Onboarding"] = "ONBOARDING";
   return OnboardingStepType2;
 })(OnboardingStepType || {});
-var RuntimeType = /* @__PURE__ */ ((RuntimeType2) => {
-  RuntimeType2["Edge"] = "EDGE";
-  RuntimeType2["Mcp"] = "MCP";
-  return RuntimeType2;
-})(RuntimeType || {});
 var ScriptType = /* @__PURE__ */ ((ScriptType3) => {
   ScriptType3["Bash"] = "BASH";
   ScriptType3["Javascript"] = "JAVASCRIPT";
@@ -145842,10 +145836,6 @@ var McpStdioService = class McpStdioService2 extends Service {
       if (!identity || !identity.name) {
         throw new Error("Cannot start MCP server: identity not found or incomplete");
       }
-      this.clientInfo = {
-        name: request.params.clientInfo.name,
-        version: request.params.clientInfo.version
-      };
       this.logger.info(`Setting MCP client name to ${request.params.clientInfo.name}`);
       if (request.params.capabilities.roots) {
         this.clientCapabilities.roots = { listChanged: request.params.capabilities.roots.listChanged ?? false };
@@ -145922,7 +145912,6 @@ var McpStdioService = class McpStdioService2 extends Service {
     }
     this.server = void 0;
     this.transport = void 0;
-    this.clientInfo = void 0;
   }
   getClientRoots() {
     return this.clientRoots.getValue();
@@ -152626,7 +152615,6 @@ var ToolService = class ToolService2 extends Service {
     this.oauthTokenService = oauthTokenService;
     this.oauthClientInfoService = oauthClientInfoService;
     this.mcpStdioService = mcpStdioService;
-    this.runtimeExecutionId = runtimeExecutionId;
     this.scriptExecutorService = scriptExecutorService;
     this.delegateService = delegateService;
     this.name = "tool";
@@ -152731,27 +152719,29 @@ var ToolService = class ToolService2 extends Service {
     const identity = this.authService.getIdentity();
     if (!identity?.workspaceId || !identity?.id) {
       this.logger.warn(`Cannot stop observing configured MCPServers for tool runtime: workspaceId or id not found`);
-      return;
-    }
-    this.logger.debug(`Stopping to observe configured MCPServers for tool runtime ${identity.workspaceId} - ${identity.id}`);
-    const drainPromises = this.natsSubscriptions.map(async (subscription) => {
-      try {
-        if (!subscription.isClosed?.()) {
-          await subscription.drain();
+    } else {
+      this.logger.debug(`Stopping to observe configured MCPServers for tool runtime ${identity.workspaceId} - ${identity.id}`);
+      const drainPromises = this.natsSubscriptions.map(async (subscription) => {
+        try {
+          if (!subscription.isClosed?.()) {
+            await subscription.drain();
+          }
+        } catch (error48) {
+          this.logger.warn(`Failed to drain subscription: ${error48}`);
         }
-      } catch (error48) {
-        this.logger.warn(`Failed to drain subscription: ${error48}`);
+      });
+      await Promise.allSettled(drainPromises);
+      this.natsSubscriptions = [];
+      for (const subscription of this.cacheSubscriptions) {
+        subscription.unsubscribe();
       }
-    });
-    await Promise.allSettled(drainPromises);
-    this.natsSubscriptions = [];
-    for (const subscription of this.cacheSubscriptions) {
-      subscription.unsubscribe();
+      this.cacheSubscriptions = [];
     }
-    this.cacheSubscriptions = [];
     const serverIds = Array.from(this.mcpServers.keys());
     for (const mcpServerId of serverIds) {
       const service = this.mcpServers.get(mcpServerId);
+      if (!service)
+        continue;
       await this.stopMCPServer({ id: mcpServerId, name: service.getName() });
     }
   }
@@ -152874,7 +152864,7 @@ var ToolService = class ToolService2 extends Service {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async handleToolCall(subscription) {
     const identity = this.authService.getIdentity();
-    const executedByIdOrAgent = identity?.nature === "runtime" ? identity.id : "AGENT";
+    const executedBy = identity?.nature === "runtime" ? identity.id : "AGENT";
     for await (const msg of subscription) {
       if (msg instanceof SkillCallToolRequest) {
         const logData = { ...msg.data, userKey: msg.data.userKey ? "[REDACTED]" : void 0 };
@@ -152888,7 +152878,7 @@ var ToolService = class ToolService2 extends Service {
         }
         if (msg.isScript()) {
           try {
-            await this.handleScriptExecution(msg, executedByIdOrAgent);
+            await this.handleScriptExecution(msg, executedBy);
           } catch (error48) {
             this.logger.error({ error: error48, scriptId: msg.data.scriptId }, "Unhandled error in script execution");
             msg.respond(new ErrorResponse({ error: "Script execution failed unexpectedly" }));
@@ -152941,7 +152931,7 @@ var ToolService = class ToolService2 extends Service {
                     ],
                     isError: true
                   },
-                  executedByIdOrAgent
+                  executedBy
                 }));
                 toolCalled = true;
                 continue;
@@ -152958,7 +152948,7 @@ var ToolService = class ToolService2 extends Service {
                   ],
                   isError: true
                 },
-                executedByIdOrAgent
+                executedBy
               }));
               toolCalled = true;
               continue;
@@ -152989,7 +152979,7 @@ var ToolService = class ToolService2 extends Service {
                   ],
                   isError: true
                 },
-                executedByIdOrAgent
+                executedBy
               }));
               toolCalled = true;
               continue;
@@ -153034,7 +153024,7 @@ var ToolService = class ToolService2 extends Service {
             }
             msg.respond(new RuntimeCallToolResponse({
               result,
-              executedByIdOrAgent
+              executedBy
             }));
           } catch (callError) {
             this.logger.error(`Tool call ${tool2.name} failed: ${callError}`);
@@ -153057,7 +153047,7 @@ var ToolService = class ToolService2 extends Service {
    * Handle script execution requests on EDGE runtime.
    * Fetches script code via NATS and executes using ScriptExecutorService.
    */
-  async handleScriptExecution(msg, executedByIdOrAgent) {
+  async handleScriptExecution(msg, executedBy) {
     const { scriptId, scriptName, workspaceId, arguments: toolArgs } = msg.data;
     const args = toolArgs?.args || [];
     this.logger.info({ scriptId, scriptName, argsCount: args.length }, "Handling script execution request");
@@ -153080,7 +153070,7 @@ var ToolService = class ToolService2 extends Service {
           ],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153090,7 +153080,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: `Error: ${fetchResponse.data.error}` }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153100,7 +153090,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: "Error: Invalid response from backend" }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153110,7 +153100,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: `Error: ${fetchResponse.data.error}` }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153122,7 +153112,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: "Error: Script has no type defined (expected Python, Bash, Javascript, or Typescript)" }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153158,7 +153148,7 @@ ${result.stderr}`;
         result: {
           content: [{ type: "text", text: output || "(Script executed successfully with no output)" }]
         },
-        executedByIdOrAgent
+        executedBy
       }));
     } else {
       const errorOutput = result.stderr || result.error || "Unknown error";
@@ -153173,7 +153163,7 @@ ${errorOutput}`;
           content: [{ type: "text", text: fullOutput }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
     }
   }
@@ -153691,10 +153681,15 @@ var MainService = class MainService2 extends Service {
       process.kill(process.pid, "SIGKILL");
     }, 1e4);
     this.logger.info(`Graceful shutdown: ${signal}`);
-    await this.stop("index");
-    clearInterval(keepAlive);
-    clearInterval(forceKill);
-    process.exit(0);
+    try {
+      await this.stop("index");
+    } catch (error48) {
+      this.logger.error({ event: "shutdown_error", err: error48 }, "Error during shutdown");
+    } finally {
+      clearInterval(keepAlive);
+      clearInterval(forceKill);
+      process.exit(0);
+    }
   }
   logActiveServices(numberOfExpectedAlive = 0) {
     const activeServices = Service.getActiveServices();