@polka-codes/runner 0.9.9 → 0.9.11

package/dist/index.js

@@ -677,7 +677,11 @@ var require_help = __commonJS((exports) => {
         extraInfo.push(`env: ${option.envVar}`);
       }
       if (extraInfo.length > 0) {
-        return `${option.description} (${extraInfo.join(", ")})`;
+        const extraDescription = `(${extraInfo.join(", ")})`;
+        if (option.description) {
+          return `${option.description} ${extraDescription}`;
+        }
+        return extraDescription;
       }
       return option.description;
     }
@@ -698,6 +702,27 @@ var require_help = __commonJS((exports) => {
       }
       return argument.description;
     }
+    formatItemList(heading, items, helper) {
+      if (items.length === 0)
+        return [];
+      return [helper.styleTitle(heading), ...items, ""];
+    }
+    groupItems(unsortedItems, visibleItems, getGroup) {
+      const result = new Map;
+      unsortedItems.forEach((item) => {
+        const group = getGroup(item);
+        if (!result.has(group))
+          result.set(group, []);
+      });
+      visibleItems.forEach((item) => {
+        const group = getGroup(item);
+        if (!result.has(group)) {
+          result.set(group, []);
+        }
+        result.get(group).push(item);
+      });
+      return result;
+    }
     formatHelp(cmd, helper) {
       const termWidth = helper.padWidth(cmd, helper);
       const helpWidth = helper.helpWidth ?? 80;
@@ -718,45 +743,27 @@ var require_help = __commonJS((exports) => {
       const argumentList = helper.visibleArguments(cmd).map((argument) => {
         return callFormatItem(helper.styleArgumentTerm(helper.argumentTerm(argument)), helper.styleArgumentDescription(helper.argumentDescription(argument)));
       });
-      if (argumentList.length > 0) {
-        output = output.concat([
-          helper.styleTitle("Arguments:"),
-          ...argumentList,
-          ""
-        ]);
-      }
-      const optionList = helper.visibleOptions(cmd).map((option) => {
-        return callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option)));
+      output = output.concat(this.formatItemList("Arguments:", argumentList, helper));
+      const optionGroups = this.groupItems(cmd.options, helper.visibleOptions(cmd), (option) => option.helpGroupHeading ?? "Options:");
+      optionGroups.forEach((options, group) => {
+        const optionList = options.map((option) => {
+          return callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option)));
+        });
+        output = output.concat(this.formatItemList(group, optionList, helper));
       });
-      if (optionList.length > 0) {
-        output = output.concat([
-          helper.styleTitle("Options:"),
-          ...optionList,
-          ""
-        ]);
-      }
       if (helper.showGlobalOptions) {
         const globalOptionList = helper.visibleGlobalOptions(cmd).map((option) => {
           return callFormatItem(helper.styleOptionTerm(helper.optionTerm(option)), helper.styleOptionDescription(helper.optionDescription(option)));
         });
-        if (globalOptionList.length > 0) {
-          output = output.concat([
-            helper.styleTitle("Global Options:"),
-            ...globalOptionList,
-            ""
-          ]);
-        }
+        output = output.concat(this.formatItemList("Global Options:", globalOptionList, helper));
       }
-      const commandList = helper.visibleCommands(cmd).map((cmd2) => {
-        return callFormatItem(helper.styleSubcommandTerm(helper.subcommandTerm(cmd2)), helper.styleSubcommandDescription(helper.subcommandDescription(cmd2)));
+      const commandGroups = this.groupItems(cmd.commands, helper.visibleCommands(cmd), (sub) => sub.helpGroup() || "Commands:");
+      commandGroups.forEach((commands, group) => {
+        const commandList = commands.map((sub) => {
+          return callFormatItem(helper.styleSubcommandTerm(helper.subcommandTerm(sub)), helper.styleSubcommandDescription(helper.subcommandDescription(sub)));
+        });
+        output = output.concat(this.formatItemList(group, commandList, helper));
       });
-      if (commandList.length > 0) {
-        output = output.concat([
-          helper.styleTitle("Commands:"),
-          ...commandList,
-          ""
-        ]);
-      }
       return output.join(`
 `);
     }
@@ -913,6 +920,7 @@ var require_option = __commonJS((exports) => {
       this.argChoices = undefined;
       this.conflictsWith = [];
       this.implied = undefined;
+      this.helpGroupHeading = undefined;
     }
     default(value, description) {
       this.defaultValue = value;
@@ -982,6 +990,10 @@ var require_option = __commonJS((exports) => {
       }
       return camelcase(this.name());
     }
+    helpGroup(heading) {
+      this.helpGroupHeading = heading;
+      return this;
+    }
     is(arg) {
       return this.short === arg || this.long === arg;
     }
@@ -1199,6 +1211,9 @@ var require_command = __commonJS((exports) => {
       this._addImplicitHelpCommand = undefined;
       this._helpCommand = undefined;
       this._helpConfiguration = {};
+      this._helpGroupHeading = undefined;
+      this._defaultCommandGroup = undefined;
+      this._defaultOptionGroup = undefined;
     }
     copyInheritedSettings(sourceCommand) {
       this._outputConfiguration = sourceCommand._outputConfiguration;
@@ -1263,7 +1278,7 @@ var require_command = __commonJS((exports) => {
     configureOutput(configuration) {
       if (configuration === undefined)
         return this._outputConfiguration;
-      Object.assign(this._outputConfiguration, configuration);
+      this._outputConfiguration = Object.assign({}, this._outputConfiguration, configuration);
       return this;
     }
     showHelpAfterError(displayHelp = true) {
@@ -1294,12 +1309,12 @@ var require_command = __commonJS((exports) => {
     createArgument(name, description) {
       return new Argument(name, description);
     }
-    argument(name, description, fn, defaultValue) {
+    argument(name, description, parseArg, defaultValue) {
       const argument = this.createArgument(name, description);
-      if (typeof fn === "function") {
-        argument.default(defaultValue).argParser(fn);
+      if (typeof parseArg === "function") {
+        argument.default(defaultValue).argParser(parseArg);
       } else {
-        argument.default(fn);
+        argument.default(parseArg);
       }
       this.addArgument(argument);
       return this;
@@ -1324,10 +1339,13 @@ var require_command = __commonJS((exports) => {
     helpCommand(enableOrNameAndArgs, description) {
       if (typeof enableOrNameAndArgs === "boolean") {
         this._addImplicitHelpCommand = enableOrNameAndArgs;
+        if (enableOrNameAndArgs && this._defaultCommandGroup) {
+          this._initCommandGroup(this._getHelpCommand());
+        }
         return this;
       }
-      enableOrNameAndArgs = enableOrNameAndArgs ?? "help [command]";
-      const [, helpName, helpArgs] = enableOrNameAndArgs.match(/([^ ]+) *(.*)/);
+      const nameAndArgs = enableOrNameAndArgs ?? "help [command]";
+      const [, helpName, helpArgs] = nameAndArgs.match(/([^ ]+) *(.*)/);
       const helpDescription = description ?? "display help for command";
       const helpCommand = this.createCommand(helpName);
       helpCommand.helpOption(false);
@@ -1337,6 +1355,8 @@ var require_command = __commonJS((exports) => {
         helpCommand.description(helpDescription);
       this._addImplicitHelpCommand = true;
       this._helpCommand = helpCommand;
+      if (enableOrNameAndArgs || description)
+        this._initCommandGroup(helpCommand);
       return this;
     }
     addHelpCommand(helpCommand, deprecatedDescription) {
@@ -1346,6 +1366,7 @@ var require_command = __commonJS((exports) => {
       }
       this._addImplicitHelpCommand = true;
       this._helpCommand = helpCommand;
+      this._initCommandGroup(helpCommand);
       return this;
     }
     _getHelpCommand() {
@@ -1425,6 +1446,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         throw new Error(`Cannot add option '${option.flags}'${this._name && ` to command '${this._name}'`} due to conflicting flag '${matchingFlag}'
 -  already used by option '${matchingOption.flags}'`);
       }
+      this._initOptionGroup(option);
       this.options.push(option);
     }
     _registerCommand(command) {
@@ -1437,6 +1459,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         const newCmd = knownBy(command).join("|");
         throw new Error(`cannot add command '${newCmd}' as already have command '${existingCmd}'`);
       }
+      this._initCommandGroup(command);
       this.commands.push(command);
     }
     addOption(option) {
@@ -1981,6 +2004,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
       function maybeOption(arg) {
         return arg.length > 1 && arg[0] === "-";
       }
+      const negativeNumberArg = (arg) => {
+        if (!/^-\d*\.?\d+(e[+-]?\d+)?$/.test(arg))
+          return false;
+        return !this._getCommandAndAncestors().some((cmd) => cmd.options.map((opt) => opt.short).some((short) => /^-\d$/.test(short)));
+      };
       let activeVariadicOption = null;
       while (args.length) {
         const arg = args.shift();
@@ -1990,7 +2018,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           dest.push(...args);
           break;
         }
-        if (activeVariadicOption && !maybeOption(arg)) {
+        if (activeVariadicOption && (!maybeOption(arg) || negativeNumberArg(arg))) {
           this.emit(`option:${activeVariadicOption.name()}`, arg);
           continue;
         }
@@ -2005,7 +2033,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
               this.emit(`option:${option.name()}`, value);
             } else if (option.optional) {
               let value = null;
-              if (args.length > 0 && !maybeOption(args[0])) {
+              if (args.length > 0 && (!maybeOption(args[0]) || negativeNumberArg(args[0]))) {
                 value = args.shift();
               }
               this.emit(`option:${option.name()}`, value);
@@ -2036,7 +2064,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
             continue;
           }
         }
-        if (maybeOption(arg)) {
+        if (dest === operands && maybeOption(arg) && !(this.commands.length === 0 && negativeNumberArg(arg))) {
           dest = unknown;
         }
         if ((this._enablePositionalOptions || this._passThroughOptions) && operands.length === 0 && unknown.length === 0) {
@@ -2271,6 +2299,32 @@ Expecting one of '${allowedValues.join("', '")}'`);
       this._name = str;
       return this;
     }
+    helpGroup(heading) {
+      if (heading === undefined)
+        return this._helpGroupHeading ?? "";
+      this._helpGroupHeading = heading;
+      return this;
+    }
+    commandsGroup(heading) {
+      if (heading === undefined)
+        return this._defaultCommandGroup ?? "";
+      this._defaultCommandGroup = heading;
+      return this;
+    }
+    optionsGroup(heading) {
+      if (heading === undefined)
+        return this._defaultOptionGroup ?? "";
+      this._defaultOptionGroup = heading;
+      return this;
+    }
+    _initOptionGroup(option) {
+      if (this._defaultOptionGroup && !option.helpGroupHeading)
+        option.helpGroup(this._defaultOptionGroup);
+    }
+    _initCommandGroup(cmd) {
+      if (this._defaultCommandGroup && !cmd.helpGroup())
+        cmd.helpGroup(this._defaultCommandGroup);
+    }
     nameFromFilename(filename) {
       this._name = path.basename(filename, path.extname(filename));
       return this;
@@ -2347,15 +2401,19 @@ Expecting one of '${allowedValues.join("', '")}'`);
     helpOption(flags, description) {
       if (typeof flags === "boolean") {
         if (flags) {
-          this._helpOption = this._helpOption ?? undefined;
+          if (this._helpOption === null)
+            this._helpOption = undefined;
+          if (this._defaultOptionGroup) {
+            this._initOptionGroup(this._getHelpOption());
+          }
         } else {
           this._helpOption = null;
         }
         return this;
       }
-      flags = flags ?? "-h, --help";
-      description = description ?? "display help for command";
-      this._helpOption = this.createOption(flags, description);
+      this._helpOption = this.createOption(flags ?? "-h, --help", description ?? "display help for command");
+      if (flags || description)
+        this._initOptionGroup(this._helpOption);
       return this;
     }
     _getHelpOption() {
@@ -2366,6 +2424,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     }
     addHelpOption(option) {
       this._helpOption = option;
+      this._initOptionGroup(option);
       return this;
     }
     help(contextOptions) {
@@ -21008,7 +21067,7 @@ var {
   Help
 } = import__.default;
 // package.json
-var version = "0.9.9";
+var version = "0.9.11";
 
 // src/runner.ts
 import { execSync } from "node:child_process";
@@ -55997,7 +56056,17 @@ ${Object.entries(example.input).map(([name17, value]) => renderParameterValue(na
 `)}
 </${toolNamePrefix}${tool.name}>
 `;
-var toolUsePrompt = (tools, toolNamePrefix) => {
+var toolUsePrompt = (useNativeTool, tools, toolNamePrefix) => {
+  if (useNativeTool) {
+    return `
+====
+
+TOOL USE
+
+- You MUST use a tool.
+- Batch tool use when feasible; avoid redundant calls.
+`;
+  }
   if (tools.length === 0) {
     return "";
   }
@@ -56348,7 +56417,8 @@ ${instance.prompt}`;
         }
         if (requestTimeoutSeconds > 0 && requestAbortController) {
           timeout = setTimeout(() => {
-            console.debug(`Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`);
+            console.debug(`
+Request timeout after ${requestTimeoutSeconds} seconds. Canceling current request attempt ${i + 1}/${retryCount}.`);
             requestAbortController?.abort();
           }, requestTimeoutSeconds * 1000);
         }
@@ -56409,7 +56479,15 @@ ${instance.prompt}`;
         }
       }
       if (this.config.toolFormat === "native") {
-        if (respMessages.some((m) => m.role === "tool")) {
+        if (respMessages.some((m) => {
+          if (m.role === "tool") {
+            return true;
+          }
+          if (typeof m.content === "string") {
+            return true;
+          }
+          return m.content.some((part) => part.type === "tool-call" || part.type === "tool-result" || part.type === "text");
+        })) {
           break;
         }
       } else {
@@ -56421,7 +56499,8 @@ ${instance.prompt}`;
         break;
       }
       if (i < retryCount - 1) {
-        console.debug(`Retrying request ${i + 2} of ${retryCount}`);
+        console.debug(`
+Retrying request ${i + 2} of ${retryCount}`);
       }
     }
     if (respMessages.length === 0) {
@@ -56659,7 +56738,7 @@ You are the **Analyzer** agent, responsible for:
 5. **Documentation Assessment**: Review documentation quality and completeness.
 6. **Non-Modification**: Never modify code or files - focus solely on analysis.
 
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${capabilities(toolNamePrefix)}
 ${systemInformation(info)}
 ${customInstructions(instructions)}
@@ -56780,7 +56859,7 @@ RETRY GUIDELINES
    - Report any partial improvements`;
 var fullSystemPrompt3 = (info, tools, toolNamePrefix, instructions, scripts, _interactive, useNativeTool) => `
 ${basePrompt}
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${codeFixingStrategies}
 ${retryGuidelines}
 ${capabilities(toolNamePrefix)}
@@ -56979,7 +57058,7 @@ You solve the user's task by working in small, verifiable steps.
 `;
 var fullSystemPrompt4 = (info, tools, toolNamePrefix, instructions, scripts, useNativeTool) => `
 ${basePrompt2}
-${useNativeTool ? "" : toolUsePrompt(tools, toolNamePrefix)}
+${toolUsePrompt(useNativeTool, tools, toolNamePrefix)}
 ${editingFilesPrompt(toolNamePrefix)}
 ${capabilities(toolNamePrefix)}
 ${rules(toolNamePrefix)}

package/package.json

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