@aigne/cli 1.26.0 → 1.26.1-1

package/dist/utils/run-with-aigne.js

@@ -4,67 +4,90 @@ import { dirname, isAbsolute, join } from "node:path";
 import { isatty } from "node:tty";
 import { promisify } from "node:util";
 import { exists } from "@aigne/agent-library/utils/fs.js";
-import { AIGNE, DEFAULT_OUTPUT_KEY, readAllString, UserAgent, } from "@aigne/core";
+import { AIAgent, AIGNE, DEFAULT_OUTPUT_KEY, readAllString, UserAgent, } from "@aigne/core";
 import { loadModel } from "@aigne/core/loader/index.js";
 import { getLevelFromEnv, LogLevel, logger } from "@aigne/core/utils/logger.js";
-import { isEmpty, isNonNullable, tryOrThrow, } from "@aigne/core/utils/type-utils.js";
+import { flat, isEmpty, tryOrThrow, } from "@aigne/core/utils/type-utils.js";
 import chalk from "chalk";
-import { Command } from "commander";
 import { parse } from "yaml";
+import yargs from "yargs";
 import { ZodError, ZodObject, z } from "zod";
 import { availableModels } from "../constants.js";
 import { TerminalTracer } from "../tracer/terminal.js";
 import { DEFAULT_CHAT_INPUT_KEY, runChatLoopInTerminal, } from "./run-chat-loop.js";
-export const createRunAIGNECommand = (name = "run") => new Command(name)
-    .allowUnknownOption(true)
-    .allowExcessArguments(true)
-    .description("Run agent with AIGNE in terminal")
-    .option("--chat", "Run chat loop in terminal", false)
-    .option("--model <provider[:model]>", `AI model to use in format 'provider[:model]' where model is optional. Examples: 'openai' or 'openai:gpt-4o-mini'. Available providers: ${availableModels()
-    .map((i) => i.name.toLowerCase().replace(/ChatModel$/i, ""))
-    .join(", ")} (default: openai)`)
-    .option("--temperature <temperature>", "Temperature for the model (controls randomness, higher values produce more random outputs). Range: 0.0-2.0", customZodError("--temperature", (s) => z.coerce.number().min(0).max(2).parse(s)))
-    .option("--top-p <top-p>", "Top P (nucleus sampling) parameter for the model (controls diversity). Range: 0.0-1.0", customZodError("--top-p", (s) => z.coerce.number().min(0).max(1).parse(s)))
-    .option("--presence-penalty <presence-penalty>", "Presence penalty for the model (penalizes repeating the same tokens). Range: -2.0 to 2.0", customZodError("--presence-penalty", (s) => z.coerce.number().min(-2).max(2).parse(s)))
-    .option("--frequency-penalty <frequency-penalty>", "Frequency penalty for the model (penalizes frequency of token usage). Range: -2.0 to 2.0", customZodError("--frequency-penalty", (s) => z.coerce.number().min(-2).max(2).parse(s)))
-    .option("--input -i <input...>", "Input to the agent, use @<file> to read from a file")
-    .option("--format <format>", "Input format for the agent (available: text, json, yaml default: text)")
-    .option("--output -o <output>", "Output file to save the result (default: stdout)")
-    .option("--output-key <output-key>", "Key in the result to save to the output file", DEFAULT_OUTPUT_KEY)
-    .option("--force", "Truncate the output file if it exists, and create directory if the output path is not exists", false)
-    .option("--log-level <level>", `Log level for detailed debugging information. Values: ${Object.values(LogLevel).join(", ")}`, customZodError("--log-level", (s) => z.nativeEnum(LogLevel).parse(s)), getLevelFromEnv(logger.options.ns) || LogLevel.INFO);
+export const createRunAIGNECommand = (yargs) => yargs
+    .option("chat", {
+    describe: "Run chat loop in terminal",
+    type: "boolean",
+    default: false,
+})
+    .option("model", {
+    describe: `AI model to use in format 'provider[:model]' where model is optional. Examples: 'openai' or 'openai:gpt-4o-mini'. Available providers: ${availableModels()
+        .map((i) => i.name.toLowerCase().replace(/ChatModel$/i, ""))
+        .join(", ")} (default: openai)`,
+    type: "string",
+})
+    .option("temperature", {
+    describe: "Temperature for the model (controls randomness, higher values produce more random outputs). Range: 0.0-2.0",
+    type: "number",
+    coerce: customZodError("--temperature", (s) => z.coerce.number().min(0).max(2).parse(s)),
+})
+    .option("top-p", {
+    describe: "Top P (nucleus sampling) parameter for the model (controls diversity). Range: 0.0-1.0",
+    type: "number",
+    coerce: customZodError("--top-p", (s) => z.coerce.number().min(0).max(1).parse(s)),
+})
+    .option("presence-penalty", {
+    describe: "Presence penalty for the model (penalizes repeating the same tokens). Range: -2.0 to 2.0",
+    type: "number",
+    coerce: customZodError("--presence-penalty", (s) => z.coerce.number().min(-2).max(2).parse(s)),
+})
+    .option("frequency-penalty", {
+    describe: "Frequency penalty for the model (penalizes frequency of token usage). Range: -2.0 to 2.0",
+    type: "number",
+    coerce: customZodError("--frequency-penalty", (s) => z.coerce.number().min(-2).max(2).parse(s)),
+})
+    .option("input", {
+    describe: "Input to the agent, use @<file> to read from a file",
+    type: "array",
+    alias: "i",
+})
+    .option("format", {
+    describe: "Input format for the agent (available: text, json, yaml default: text)",
+    type: "string",
+})
+    .option("output", {
+    describe: "Output file to save the result (default: stdout)",
+    type: "string",
+    alias: "o",
+})
+    .option("output-key", {
+    describe: "Key in the result to save to the output file",
+    type: "string",
+    default: DEFAULT_OUTPUT_KEY,
+})
+    .option("force", {
+    describe: "Truncate the output file if it exists, and create directory if the output path is not exists",
+    type: "boolean",
+    default: false,
+})
+    .option("log-level", {
+    describe: `Log level for detailed debugging information. Values: ${Object.values(LogLevel).join(", ")}`,
+    type: "string",
+    default: getLevelFromEnv(logger.options.ns) || LogLevel.INFO,
+    coerce: customZodError("--log-level", (s) => z.nativeEnum(LogLevel).parse(s)),
+});
 export async function parseAgentInputByCommander(agent, options = {}) {
-    const cmd = new Command()
-        .description(`Run agent ${agent.name} with AIGNE`)
-        .allowUnknownOption(true)
-        .allowExcessArguments(true);
-    const inputSchemaShape = agent.inputSchema instanceof ZodObject ? Object.keys(agent.inputSchema.shape) : [];
-    for (const option of inputSchemaShape) {
-        cmd.option(`--input-${option} <${option}>`);
-    }
-    const input = await new Promise((resolve, reject) => {
-        cmd
-            .action(async (agentInputOptions) => {
-            try {
-                const input = Object.fromEntries((await Promise.all(Object.entries(agentInputOptions).map(async ([key, value]) => {
-                    let k = key.replace(/^input/, "");
-                    k = k.charAt(0).toLowerCase() + k.slice(1);
-                    if (!k)
-                        return null;
-                    if (typeof value === "string" && value.startsWith("@")) {
-                        value = await readFile(value.slice(1), "utf8");
-                    }
-                    return [k, value];
-                }))).filter(isNonNullable));
-                resolve(input);
-            }
-            catch (error) {
-                reject(error);
-            }
-        })
-            .parseAsync(options.argv ?? process.argv)
-            .catch((error) => reject(error));
-    });
+    const inputSchemaShape = flat(agent instanceof AIAgent ? agent.inputKey : undefined, agent.inputSchema instanceof ZodObject ? Object.keys(agent.inputSchema.shape) : []);
+    const parsedInput = await yargs().parseAsync(options.argv ?? process.argv);
+    const input = Object.fromEntries(await Promise.all(inputSchemaShape.map(async (key) => {
+        const k = `input${key.charAt(0).toUpperCase()}${key.slice(1)}`;
+        let value = parsedInput[k];
+        if (typeof value === "string" && value.startsWith("@")) {
+            value = await readFile(value.slice(1), "utf8");
+        }
+        return [key, value];
+    })));
     const rawInput = options.input ||
         (isatty(process.stdin.fd) || !(await stdinHasData())
             ? null
@@ -96,14 +119,12 @@ export async function parseAgentInputByCommander(agent, options = {}) {
     return input;
 }
 export const parseModelOption = (model) => {
-    const { provider, name } = (model || process.env.MODEL)?.match(/(?<provider>[^:]+)(:(?<name>(\S+)))?/)?.groups ?? {};
+    const { provider, name } = (model || process.env.MODEL)?.match(/(?<provider>[^:]*)(:(?<name>(\S+)))?/)?.groups ?? {};
     return { provider, name };
 };
 export async function runWithAIGNE(agentCreator, { argv = process.argv, chatLoopOptions, modelOptions, outputKey, } = {}) {
-    await createRunAIGNECommand()
-        .showHelpAfterError(true)
-        .showSuggestionAfterError(true)
-        .action(async (options) => {
+    await yargs()
+        .command("$0", "Run an agent with AIGNE", (yargs) => createRunAIGNECommand(yargs), async (options) => {
         if (options.logLevel) {
             logger.level = options.logLevel;
         }
@@ -134,6 +155,8 @@ export async function runWithAIGNE(agentCreator, { argv = process.argv, chatLoop
             await aigne.shutdown();
         }
     })
+        .alias("h", "help")
+        .alias("v", "version")
         .parseAsync(argv)
         .catch((error) => {
         console.error(`${chalk.red("Error:")} ${error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/cli",
-  "version": "1.26.0",
+  "version": "1.26.1-1",
   "description": "cli for AIGNE framework",
   "publishConfig": {
     "access": "public"
@@ -44,6 +44,7 @@
   "dependencies": {
     "@aigne/listr2": "^1.0.10",
     "@aigne/marked-terminal": "^7.3.2",
+    "@blocklet/aigne-hub": "^0.2.17",
     "@inquirer/prompts": "^7.6.0",
     "@inquirer/type": "^3.0.8",
     "@listr2/prompt-adapter-inquirer": "^3.0.1",
@@ -51,7 +52,6 @@
     "@ocap/mcrypto": "^1.21.0",
     "@smithy/node-http-handler": "^4.1.0",
     "chalk": "^5.4.1",
-    "commander": "^14.0.0",
     "crypto": "^1.0.1",
     "detect-port": "^2.1.0",
     "dotenv-flow": "^4.1.0",
@@ -69,21 +69,22 @@
     "tar": "^7.4.3",
     "wrap-ansi": "^9.0.0",
     "yaml": "^2.8.0",
+    "yargs": "^18.0.0",
     "zod": "^3.25.67",
     "@aigne/agentic-memory": "^1.0.6",
-    "@aigne/agent-library": "^1.21.6",
     "@aigne/aigne-hub": "^0.2.2",
     "@aigne/anthropic": "^0.10.2",
-    "@aigne/deepseek": "^0.7.6",
+    "@aigne/agent-library": "^1.21.6",
     "@aigne/bedrock": "^0.8.6",
     "@aigne/core": "^1.39.0",
+    "@aigne/deepseek": "^0.7.6",
     "@aigne/default-memory": "^1.0.6",
-    "@aigne/gemini": "^0.8.6",
-    "@aigne/ollama": "^0.7.6",
     "@aigne/observability-api": "^0.8.2",
+    "@aigne/ollama": "^0.7.6",
     "@aigne/open-router": "^0.7.6",
-    "@aigne/openai": "^0.10.6",
-    "@aigne/xai": "^0.7.6"
+    "@aigne/xai": "^0.7.6",
+    "@aigne/gemini": "^0.8.6",
+    "@aigne/openai": "^0.10.6"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
@@ -92,6 +93,7 @@
     "@types/glob": "^9.0.0",
     "@types/gradient-string": "^1.1.6",
     "@types/node": "^24.0.12",
+    "@types/yargs": "^17.0.33",
     "archiver": "^7.0.1",
     "hono": "4.8.4",
     "npm-run-all": "^4.1.5",