@skilder-ai/runtime 0.7.2 → 0.7.4

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";
@@ -138467,6 +138461,34 @@ var WorkspaceRole = /* @__PURE__ */ ((WorkspaceRole2) => {
   return WorkspaceRole2;
 })(WorkspaceRole || {});
 
+// ../common/src/utils/parse-script-args.ts
+function parseScriptArgs(argsString) {
+  const args = [];
+  let current = "";
+  let inQuotes = false;
+  let quoteChar = "";
+  for (const char of argsString) {
+    if ((char === '"' || char === "'") && !inQuotes) {
+      inQuotes = true;
+      quoteChar = char;
+    } else if (char === quoteChar && inQuotes) {
+      inQuotes = false;
+      quoteChar = "";
+    } else if (char === " " && !inQuotes) {
+      if (current) {
+        args.push(current);
+        current = "";
+      }
+    } else {
+      current += char;
+    }
+  }
+  if (current) {
+    args.push(current);
+  }
+  return args;
+}
+
 // ../common/src/related-content-detector.ts
 function escapeRegex2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -144826,39 +144848,9 @@ For other resources, use the \`learn\` tool instead.`
       };
     }
     const script = scriptEntry;
-    const args = lookupArgs ? this.parseScriptArgs(lookupArgs) : [];
+    const args = lookupArgs ? parseScriptArgs(lookupArgs) : [];
     return await this.routeScriptToRuntime(script, skill, args);
   }
-  /**
-   * Parse script arguments from the path string.
-   * Arguments can be space-separated, with quoted strings supported.
-   */
-  parseScriptArgs(argsString) {
-    const args = [];
-    let current = "";
-    let inQuotes = false;
-    let quoteChar = "";
-    for (const char of argsString) {
-      if ((char === '"' || char === "'") && !inQuotes) {
-        inQuotes = true;
-        quoteChar = char;
-      } else if (char === quoteChar && inQuotes) {
-        inQuotes = false;
-        quoteChar = "";
-      } else if (char === " " && !inQuotes) {
-        if (current) {
-          args.push(current);
-          current = "";
-        }
-      } else {
-        current += char;
-      }
-    }
-    if (current) {
-      args.push(current);
-    }
-    return args;
-  }
   /**
    * Route script execution to a runtime via NATS.
    * Scripts always execute on the runtime linked to the script.
@@ -145184,34 +145176,68 @@ This file can be used with other file I/O tools that accept \`@skilder-file:/\`
     const lines = [];
     lines.push(`# Skill: ${skill.name}`);
     lines.push("");
+    lines.push(...this.formatSkillDetails(skill));
+    return {
+      response: { content: [{ type: "text", text: lines.join("\n") }] },
+      skillIds: [skill.id]
+    };
+  }
+  /**
+   * Format full details for a single skill including description, instructions, tool schemas,
+   * and referenced resources. Used by both handleLearnSkill and handleGetHat to ensure DRY
+   * consistency when rendering skill content.
+   *
+   * @param skill - The skill catalog entry to format
+   * @param options.headingLevel - Heading level for tools section (2 for standalone, 4 for within-hat)
+   * @param options.renderedToolNames - Set of tool names already rendered (for deduplication across skills in a hat)
+   */
+  formatSkillDetails(skill, options) {
+    const headingLevel = options?.headingLevel ?? 2;
+    const heading = "#".repeat(headingLevel);
+    const renderedToolNames = options?.renderedToolNames;
+    const firstSkillForTool = options?.firstSkillForTool;
+    const lines = [];
     if (skill.description) {
       lines.push(skill.description);
       lines.push("");
     }
     if (skill.instructions) {
-      lines.push("## Instructions");
+      lines.push(`${heading} Instructions`);
       lines.push(skill.instructions);
       lines.push("");
     }
     if (skill.toolNames.length > 0) {
-      lines.push("## Available Tools");
+      lines.push(`${heading} Available Tools`);
       lines.push("Use `call_tool` with the tool name and input to execute these tools:");
       lines.push("");
       for (const toolName of skill.toolNames) {
-        const tool2 = this.tools.getValue()?.find((t4) => t4.name === toolName);
-        if (tool2) {
-          lines.push(`### ${tool2.name}`);
-          lines.push(tool2.description || "No description");
-          lines.push("");
-          lines.push("**Input Schema:**");
-          lines.push("```json");
-          lines.push(JSON.stringify(tool2.inputSchema, null, 2));
-          lines.push("```");
+        const subHeading = "#".repeat(headingLevel + 1);
+        if (renderedToolNames?.has(toolName)) {
+          const firstSkill = firstSkillForTool?.get(toolName);
+          lines.push(`${subHeading} ${toolName}`);
+          lines.push(firstSkill ? `(schema shown above under ${firstSkill})` : "(schema shown above)");
           lines.push("");
         } else {
-          lines.push(`### ${toolName}`);
-          lines.push("Tool definition not available");
-          lines.push("");
+          if (renderedToolNames) {
+            renderedToolNames.add(toolName);
+            firstSkillForTool?.set(toolName, skill.name);
+          }
+          const tool2 = this.tools.getValue()?.find((t4) => t4.name === toolName);
+          if (tool2) {
+            lines.push(`${subHeading} ${tool2.name}`);
+            lines.push(tool2.description || "No description");
+            lines.push("");
+            lines.push("**Input Schema:**");
+            lines.push("```json");
+            lines.push(JSON.stringify(tool2.inputSchema, null, 2));
+            lines.push("```");
+            lines.push("");
+          } else {
+            this.logger.warn({ toolName, skillId: skill.id, toolsInitialized: this.tools.getValue() != null }, `Tool "${toolName}" referenced by skill "${skill.name}" not found in tools list`);
+            lines.push(`${subHeading} ${toolName}`);
+            lines.push("Tool definition not available");
+            lines.push("");
+          }
         }
       }
       lines.push('Call these tools using: `call_tool(tool_name="<name>", tool_input={...})`');
@@ -145227,10 +145253,7 @@ This file can be used with other file I/O tools that accept \`@skilder-file:/\`
     } catch (error48) {
       this.logger.warn({ error: error48, skillId: skill.id }, "Failed to detect related mentions in skill instructions");
     }
-    return {
-      response: { content: [{ type: "text", text: lines.join("\n") }] },
-      skillIds: [skill.id]
-    };
+    return lines;
   }
   /**
    * Handle feedback_skill tool call.
@@ -145502,27 +145525,19 @@ ${JSON.stringify(toolConfig.inputSchema, null, 2)}`
     }
     this.session.learnedHatIds.add(hat.id);
     const skills = [];
-    const allToolNames = /* @__PURE__ */ new Set();
     const missingSkillIds = [];
     for (const skillId of hat.skillIds) {
       const skill = this.catalog.skills.find((s) => s.id === skillId);
       if (skill) {
         this.session.learnedSkillIds.add(skill.id);
-        skills.push({
-          name: skill.name,
-          description: skill.description,
-          instructions: skill.instructions,
-          toolNames: skill.toolNames
-        });
-        for (const toolName of skill.toolNames) {
-          allToolNames.add(toolName);
-        }
+        skills.push(skill);
       } else {
-        this.logger.warn(`Skill ID "${skillId}" referenced in hat "${hat.name}" not found in catalog`);
+        this.logger.warn({ skillId, hatId: hat.id, hatName: hat.name }, "Skill referenced in hat not found in catalog");
         missingSkillIds.push(skillId);
       }
     }
-    this.logger.info(`User ${this.identity.id} retrieved hat "${hat.name}" with ${skills.length} skills and ${allToolNames.size} tools`);
+    const totalToolCount = new Set(skills.flatMap((s) => s.toolNames)).size;
+    this.logger.info(`User ${this.identity.id} retrieved hat "${hat.name}" with ${skills.length} skills and ${totalToolCount} tools`);
     const lines = [];
     lines.push(`# Hat: ${hat.name}`);
     lines.push("");
@@ -145538,43 +145553,18 @@ ${JSON.stringify(toolConfig.inputSchema, null, 2)}`
     if (skills.length > 0) {
       lines.push("## Skills Learned");
       lines.push("");
+      const renderedToolNames = /* @__PURE__ */ new Set();
+      const firstSkillForTool = /* @__PURE__ */ new Map();
       for (const skill of skills) {
         lines.push(`### ${skill.name}`);
-        if (skill.description) {
-          lines.push(skill.description);
-        }
-        if (skill.instructions) {
-          lines.push("");
-          lines.push("**Instructions:**");
-          lines.push(skill.instructions);
-        }
-        if (skill.toolNames.length > 0) {
-          lines.push("");
-          lines.push(`**Tools:** ${skill.toolNames.join(", ")}`);
-        }
+        lines.push(...this.formatSkillDetails(skill, { headingLevel: 4, renderedToolNames, firstSkillForTool }));
         lines.push("");
       }
     } else {
       lines.push("This hat contains no skills.");
       lines.push("");
     }
-    if (allToolNames.size > 0) {
-      lines.push("## All Available Tools");
-      lines.push("");
-      lines.push("The following tools are now available:");
-      for (const toolName of allToolNames) {
-        const tool2 = this.tools.getValue()?.find((t4) => t4.name === toolName);
-        if (tool2) {
-          lines.push(`- **${tool2.name}**: ${tool2.description || "No description"}`);
-        } else {
-          lines.push(`- **${toolName}**`);
-        }
-      }
-      lines.push("");
-      lines.push("You can now use these tools to help the user.");
-    }
     if (missingSkillIds.length > 0) {
-      lines.push("");
       lines.push("## Warning");
       lines.push("");
       lines.push(`Some skills referenced by this hat could not be loaded: ${missingSkillIds.join(", ")}`);
@@ -145842,10 +145832,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 +145908,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 +152611,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 +152715,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 +152860,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 +152874,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 +152927,7 @@ var ToolService = class ToolService2 extends Service {
                     ],
                     isError: true
                   },
-                  executedByIdOrAgent
+                  executedBy
                 }));
                 toolCalled = true;
                 continue;
@@ -152958,7 +152944,7 @@ var ToolService = class ToolService2 extends Service {
                   ],
                   isError: true
                 },
-                executedByIdOrAgent
+                executedBy
               }));
               toolCalled = true;
               continue;
@@ -152989,7 +152975,7 @@ var ToolService = class ToolService2 extends Service {
                   ],
                   isError: true
                 },
-                executedByIdOrAgent
+                executedBy
               }));
               toolCalled = true;
               continue;
@@ -153034,7 +153020,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,9 +153043,10 @@ 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 || [];
+    const rawArgs = toolArgs?.args;
+    const args = Array.isArray(rawArgs) ? rawArgs : typeof rawArgs === "string" && rawArgs.trim() ? parseScriptArgs(rawArgs) : [];
     this.logger.info({ scriptId, scriptName, argsCount: args.length }, "Handling script execution request");
     const fetchRequest = SkillFetchScriptRequest.create({
       scriptId,
@@ -153080,7 +153067,7 @@ var ToolService = class ToolService2 extends Service {
           ],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153090,7 +153077,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: `Error: ${fetchResponse.data.error}` }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153100,7 +153087,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: "Error: Invalid response from backend" }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153110,7 +153097,7 @@ var ToolService = class ToolService2 extends Service {
           content: [{ type: "text", text: `Error: ${fetchResponse.data.error}` }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
       return;
     }
@@ -153122,7 +153109,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 +153145,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 +153160,7 @@ ${errorOutput}`;
           content: [{ type: "text", text: fullOutput }],
           isError: true
         },
-        executedByIdOrAgent
+        executedBy
       }));
     }
   }
@@ -153691,10 +153678,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();