@skilder-ai/runtime 0.7.3 → 0.7.4

package/dist/index.js

@@ -138461,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, "\\$&");
@@ -144820,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.
@@ -145178,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={...})`');
@@ -145221,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.
@@ -145496,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("");
@@ -145532,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(", ")}`);
@@ -153049,7 +153045,8 @@ var ToolService = class ToolService2 extends Service {
    */
   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,