ignis-agent-cli 0.1.0 → 0.1.2

package/README.md

@@ -24,7 +24,8 @@ ignis ask --prompt-file prompt.md --attach image.png --json
 ignis ask --file-id image_123.png "继续分析这张图"
 ignis history
 ignis skills --query video
-ignis status <turn_id>
+ignis result <turn_id>
+ignis wait <turn_id>
 ignis resume <turn_id> --answer "继续"
 ignis cancel <turn_id>
 ignis upload ./demo.png

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command10 } from "commander";
+import { Command as Command11 } from "commander";
 
 // src/commands/ask.ts
 import { readFile as readFile3 } from "fs/promises";
@@ -530,6 +530,12 @@ function mapTurnExitCode(status) {
   }
   return 1;
 }
+function mapTurnSnapshotExitCode(status) {
+  if (status === "queued" || status === "running") {
+    return 0;
+  }
+  return mapTurnExitCode(status);
+}
 function printProgress(message) {
   process.stderr.write(`${message}
 `);
@@ -582,7 +588,7 @@ function inferExitCode(error) {
 // src/commands/ask.ts
 function buildAskCommand() {
   const command = new Command2("ask");
-  command.description("Submit one turn").argument("[message]", "Message text").addOption(new Option2("--prompt-file <path>", "Read prompt text from file")).addOption(new Option2("--attach <path>", "Upload and attach a file").default([], void 0).argParser(collectValues)).addOption(new Option2("--file-id <id>", "Reuse an existing uploaded file_id").default([], void 0).argParser(collectValues)).addOption(new Option2("--session <id>", "Continue an existing session")).addOption(new Option2("--new", "Start a new session instead of reusing the cwd session")).addOption(new Option2("--canvas <id>", "Create a new session under an existing canvas")).addOption(new Option2("--agent <name>", "Override agent name")).addOption(new Option2("--skill <id>", "Skill ID").default("base")).addOption(new Option2("--async", "Return immediately after submission without polling")).addOption(new Option2("--wait-ms <ms>", "Per-request server wait window").default("25000")).addOption(new Option2("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).addOption(new Option2("--no-session-cache", "Do not read or write cwd-scoped session cache")).hook("preAction", () => {
+  command.description("Submit one turn").argument("[message]", "Message text").addOption(new Option2("--prompt-file <path>", "Read prompt text from file")).addOption(new Option2("--attach <path>", "Upload and attach a file").default([], void 0).argParser(collectValues)).addOption(new Option2("--file-id <id>", "Reuse an existing uploaded file_id").default([], void 0).argParser(collectValues)).addOption(new Option2("--session <id>", "Continue an existing session")).addOption(new Option2("--new", "Start a new session instead of reusing the cwd session")).addOption(new Option2("--canvas <id>", "Create a new session under an existing canvas")).addOption(new Option2("--agent <name>", "Override agent name")).addOption(new Option2("--async", "Return immediately after submission without polling")).addOption(new Option2("--wait-ms <ms>", "Per-request server wait window").default("25000")).addOption(new Option2("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).addOption(new Option2("--no-session-cache", "Do not read or write cwd-scoped session cache")).hook("preAction", () => {
   }).action(
     wrapCommand(async (messageArg, options) => {
       const message = await resolvePrompt(messageArg, options.promptFile);
@@ -605,7 +611,6 @@ function buildAskCommand() {
         message,
         file_ids: fileIds,
         agent: options.agent?.trim() || void 0,
-        skill_id: options.skill,
         wait_ms: options.async ? 0 : toPositiveInt(options.waitMs, 25e3),
         idempotency_key: crypto.randomUUID()
       };
@@ -767,12 +772,39 @@ function buildLoginCommand() {
   return command;
 }
 
+// src/commands/result.ts
+import { Command as Command6, Option as Option4 } from "commander";
+function buildResultCommand() {
+  const command = new Command6("result");
+  command.description("Fetch the current result snapshot for a turn or session").argument("[turn-id]", "Turn ID").addOption(new Option4("--session <id>", "Resolve the latest turn from a session")).action(
+    wrapCommand(async (turnId, options) => {
+      const { client, config } = await createClient(options);
+      const sessionId = options.session?.trim() || getSessionForContext(config);
+      let turn;
+      if (turnId?.trim()) {
+        turn = await client.getTurn(turnId.trim());
+      } else if (sessionId) {
+        turn = await client.getLatestSessionTurn(sessionId);
+      } else {
+        throw new IgnisCliError("No turn or session selected. Pass <turn-id>, --session, or run `ignis ask` in this directory first.");
+      }
+      if (options.json) {
+        printJson(turn);
+      } else {
+        printTurnHuman(turn);
+      }
+      return mapTurnSnapshotExitCode(turn.status);
+    })
+  );
+  return addRuntimeOptions(command);
+}
+
 // src/commands/resume.ts
 import { readFile as readFile4 } from "fs/promises";
-import { Command as Command6, Option as Option4 } from "commander";
+import { Command as Command7, Option as Option5 } from "commander";
 function buildResumeCommand() {
-  const command = new Command6("resume");
-  command.description("Resume an interrupted turn").argument("<turn-id>", "Interrupted turn ID").addOption(new Option4("--answer <text>", "Provide one answer value").default([], void 0).argParser(collectValues)).addOption(new Option4("--payload <json-or-@file>", "Raw resume payload JSON")).addOption(new Option4("--cancel", "Cancel the interrupted turn instead of answering")).addOption(new Option4("--async", "Return immediately after submission without polling")).addOption(new Option4("--wait-ms <ms>", "Per-request server wait window").default("25000")).addOption(new Option4("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).action(
+  const command = new Command7("resume");
+  command.description("Resume an interrupted turn").argument("<turn-id>", "Interrupted turn ID").addOption(new Option5("--answer <text>", "Provide one answer value").default([], void 0).argParser(collectValues)).addOption(new Option5("--payload <json-or-@file>", "Raw resume payload JSON")).addOption(new Option5("--cancel", "Cancel the interrupted turn instead of answering")).addOption(new Option5("--async", "Return immediately after submission without polling")).addOption(new Option5("--wait-ms <ms>", "Per-request server wait window").default("25000")).addOption(new Option5("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).action(
     wrapCommand(async (turnId, options) => {
       const { client } = await createClient(options);
       const response = await buildResumePayload(options);
@@ -828,13 +860,13 @@ async function parseJsonInput(value) {
 }
 
 // src/commands/skills.ts
-import { Command as Command7, Option as Option5 } from "commander";
+import { Command as Command8, Option as Option6 } from "commander";
 function buildSkillsCommand() {
-  const command = new Command7("skills");
-  command.description("List/search available skills").addOption(new Option5("--query <text>", "Search skills by keyword").default("")).addOption(new Option5("--limit <n>", "Number of skills to fetch").default("50")).addOption(new Option5("--offset <n>", "Number of skills to skip").default("0")).action(wrapCommand(async (options) => handleSkillsList(options)));
+  const command = new Command8("skills");
+  command.description("List/search available skills").addOption(new Option6("--query <text>", "Search skills by keyword").default("")).addOption(new Option6("--limit <n>", "Number of skills to fetch").default("50")).addOption(new Option6("--offset <n>", "Number of skills to skip").default("0")).action(wrapCommand(async (options) => handleSkillsList(options)));
   addRuntimeOptions(command);
-  const listCommand = new Command7("list");
-  listCommand.description("List/search available skills").addOption(new Option5("--query <text>", "Search skills by keyword").default("")).addOption(new Option5("--limit <n>", "Number of skills to fetch").default("50")).addOption(new Option5("--offset <n>", "Number of skills to skip").default("0")).action(wrapCommand(async (options) => handleSkillsList(options)));
+  const listCommand = new Command8("list");
+  listCommand.description("List/search available skills").addOption(new Option6("--query <text>", "Search skills by keyword").default("")).addOption(new Option6("--limit <n>", "Number of skills to fetch").default("50")).addOption(new Option6("--offset <n>", "Number of skills to skip").default("0")).action(wrapCommand(async (options) => handleSkillsList(options)));
   addRuntimeOptions(listCommand);
   command.addCommand(listCommand);
   return command;
@@ -861,11 +893,30 @@ function toNonNegativeInt2(value, fallbackValue) {
   return parsed;
 }
 
-// src/commands/status.ts
-import { Command as Command8, Option as Option6 } from "commander";
-function buildStatusCommand() {
-  const command = new Command8("status");
-  command.description("Fetch the latest state of a turn or session").argument("[turn-id]", "Turn ID").addOption(new Option6("--session <id>", "Resolve the latest turn from a session")).addOption(new Option6("--wait", "Poll until terminal state")).addOption(new Option6("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).action(
+// src/commands/upload.ts
+import { Command as Command9 } from "commander";
+function buildUploadCommand() {
+  const command = new Command9("upload");
+  command.description("Upload a file and return its file_id").argument("<path>", "Local file path").action(
+    wrapCommand(async (filePath, options) => {
+      const { client } = await createClient(options);
+      const uploaded = await client.uploadFile(filePath);
+      if (options.json) {
+        printJson(uploaded);
+      } else {
+        printUploadHuman(uploaded);
+      }
+      return 0;
+    })
+  );
+  return addRuntimeOptions(command);
+}
+
+// src/commands/wait.ts
+import { Command as Command10, Option as Option7 } from "commander";
+function buildWaitCommand() {
+  const command = new Command10("wait");
+  command.description("Wait until a turn reaches a terminal state").argument("[turn-id]", "Turn ID").addOption(new Option7("--session <id>", "Resolve the latest turn from a session")).addOption(new Option7("--timeout-ms <ms>", "Client-side polling timeout").default("300000")).action(
     wrapCommand(async (turnId, options) => {
       const { client, config } = await createClient(options);
       const sessionId = options.session?.trim() || getSessionForContext(config);
@@ -877,7 +928,7 @@ function buildStatusCommand() {
       } else {
         throw new IgnisCliError("No turn or session selected. Pass <turn-id>, --session, or run `ignis ask` in this directory first.");
       }
-      if (options.wait && (turn.status === "running" || turn.status === "queued")) {
+      if (turn.status === "running" || turn.status === "queued") {
         turn = await client.waitForTurn(turn, {
           timeoutMs: Number.parseInt(options.timeoutMs, 10) || 3e5
         });
@@ -893,33 +944,15 @@ function buildStatusCommand() {
   return addRuntimeOptions(command);
 }
 
-// src/commands/upload.ts
-import { Command as Command9 } from "commander";
-function buildUploadCommand() {
-  const command = new Command9("upload");
-  command.description("Upload a file and return its file_id").argument("<path>", "Local file path").action(
-    wrapCommand(async (filePath, options) => {
-      const { client } = await createClient(options);
-      const uploaded = await client.uploadFile(filePath);
-      if (options.json) {
-        printJson(uploaded);
-      } else {
-        printUploadHuman(uploaded);
-      }
-      return 0;
-    })
-  );
-  return addRuntimeOptions(command);
-}
-
 // src/index.ts
-var program = new Command10();
-program.name("ignis").description("Ignis CLI for Ultra-Mai").version("0.1.0");
+var program = new Command11();
+program.name("ignis").description("Ignis CLI for Ultra-Mai").version("0.1.1");
 program.addCommand(buildLoginCommand());
 program.addCommand(buildAskCommand());
 program.addCommand(buildHistoryCommand());
 program.addCommand(buildSkillsCommand());
-program.addCommand(buildStatusCommand());
+program.addCommand(buildResultCommand());
+program.addCommand(buildWaitCommand());
 program.addCommand(buildResumeCommand());
 program.addCommand(buildCancelCommand());
 program.addCommand(buildUploadCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ignis-agent-cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Stateless CLI for the Ultra-Mai Agent V2 service",
   "license": "UNLICENSED",
   "type": "module",
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/adtech-crypto/mai-2-tmp/issues"
   },
-  "homepage": "https://github.com/adtech-crypto/mai-2-tmp/tree/test/ignis",
+  "homepage": "https://github.com/adtech-crypto/mai-2-tmp/tree/test/ignis-cli",
   "keywords": [
     "ignis",
     "cli",