@polka-codes/runner 0.8.5 → 0.8.7

package/dist/index.js

@@ -32736,7 +32736,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.8.5";
+var version = "0.8.7";
 
 // src/runner.ts
 import { execSync } from "node:child_process";
@@ -42129,6 +42129,14 @@ var getStringArray = (args2, name2, defaultValue) => {
   if (ret === "") {
     return [];
   }
+  if (Array.isArray(ret)) {
+    for (const item of ret) {
+      if (typeof item !== "string") {
+        throw new Error(`Invalid argument type: ${name2} ${item}`);
+      }
+    }
+    return ret;
+  }
   if (typeof ret !== "string") {
     throw new Error(`Invalid argument type: ${name2} ${ret}`);
   }
@@ -42197,6 +42205,7 @@ var toolInfo = {
       description: "One or more follow-up questions you need answered before you can continue.",
       required: true,
       allowMultiple: true,
+      usageValue: "questions here",
       children: [
         {
           name: "prompt",
@@ -43411,17 +43420,47 @@ var getAvailableTools = ({
 };
 
 // ../core/src/Agent/parseAssistantMessage.ts
-function parseNestedParameters(content, parameterPrefix) {
+function parseNestedParameters(content, parameterPrefix, childrenParams) {
   const result = {};
   const nestedParamRegex = new RegExp(`<${parameterPrefix}([^>]+)>([\\s\\S]*?)<\\/${parameterPrefix}\\1>`, "gs");
+  const arrayParams = new Set;
+  if (childrenParams) {
+    for (const param of childrenParams) {
+      if (param.allowMultiple) {
+        arrayParams.add(param.name);
+      }
+    }
+  }
   while (true) {
     const match = nestedParamRegex.exec(content);
     if (match === null)
       break;
     const paramName = match[1];
     const paramContent = match[2].trim();
-    if (paramContent.includes(`<${parameterPrefix}`)) {
-      result[paramName] = parseNestedParameters(paramContent, parameterPrefix);
+    const childParam = childrenParams?.find((p2) => p2.name === paramName);
+    if (paramContent.includes(`<${parameterPrefix}`) && childParam?.children) {
+      const nestedResult = parseNestedParameters(paramContent, parameterPrefix, childParam.children);
+      if (arrayParams.has(paramName)) {
+        if (!result[paramName]) {
+          result[paramName] = [];
+        }
+        if (Array.isArray(result[paramName])) {
+          result[paramName].push(nestedResult);
+        } else {
+          result[paramName] = [nestedResult];
+        }
+      } else {
+        result[paramName] = nestedResult;
+      }
+    } else if (arrayParams.has(paramName)) {
+      if (!result[paramName]) {
+        result[paramName] = [];
+      }
+      if (Array.isArray(result[paramName])) {
+        result[paramName].push(paramContent);
+      } else {
+        result[paramName] = [paramContent];
+      }
     } else {
       result[paramName] = paramContent;
     }
@@ -43465,15 +43504,29 @@ function parseAssistantMessage(assistantMessage, tools, toolNamePrefix) {
           paramMatches.push(paramMatch[1].trim());
         }
         if (paramMatches.length > 0) {
-          if (paramMatches.length === 1) {
+          if (paramMatches.length === 1 && !param.allowMultiple) {
             const paramContent = paramMatches[0];
-            if (paramContent.includes(`<${parameterPrefix}`)) {
-              params[param.name] = parseNestedParameters(paramContent, parameterPrefix);
+            if (paramContent.includes(`<${parameterPrefix}`) && param.children) {
+              params[param.name] = parseNestedParameters(paramContent, parameterPrefix, param.children);
             } else {
               params[param.name] = paramContent;
             }
           } else {
-            params[param.name] = paramMatches;
+            if (param.allowMultiple) {
+              params[param.name] = paramMatches.map((paramContent) => {
+                if (paramContent.includes(`<${parameterPrefix}`) && param.children) {
+                  return parseNestedParameters(paramContent, parameterPrefix, param.children);
+                }
+                return paramContent;
+              });
+            } else {
+              const paramContent = paramMatches[0];
+              if (paramContent.includes(`<${parameterPrefix}`) && param.children) {
+                params[param.name] = parseNestedParameters(paramContent, parameterPrefix, param.children);
+              } else {
+                params[param.name] = paramContent;
+              }
+            }
           }
         }
       }
@@ -43526,12 +43579,13 @@ var toolInfoPrompt = (tool, toolNamePrefix, parameterPrefix) => `
 Description: ${tool.description}
 
 Parameters:
-${tool.parameters.map((param) => `- ${parameterPrefix}${param.name}: (${param.required ? "required" : "optional"}) ${param.description}`).join(`
+${tool.parameters.map((param) => `- ${parameterPrefix}${param.name}: (${param.required ? "required" : "optional"})${param.allowMultiple ? " (multiple allowed)" : ""} ${param.description}`).join(`
 `)}
 
 Usage:
 <${toolNamePrefix}${tool.name}>
-${tool.parameters.map((param) => `<${parameterPrefix}${param.name}>${param.usageValue}</${parameterPrefix}${param.name}>`).join(`
+${tool.parameters.map((param) => param.allowMultiple ? `<${parameterPrefix}${param.name}>${param.usageValue}</${parameterPrefix}${param.name}>
+<${parameterPrefix}${param.name}>${param.usageValue}</${parameterPrefix}${param.name}>` : `<${parameterPrefix}${param.name}>${param.usageValue}</${parameterPrefix}${param.name}>`).join(`
 `)}
 </${toolNamePrefix}${tool.name}>`;
 var toolInfoExamplesPrompt = (tool, example, toolNamePrefix, parameterPrefix) => `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/runner",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",