@ai-setting/roy-agent-cli 1.5.115 → 1.5.117

package/dist/bin/roy-agent.js

@@ -7427,7 +7427,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.115",
+    version: "1.5.117",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -19482,7 +19482,7 @@ var WorkflowGetCommand = {
   command: "get <identifier>",
   describe: "获取 Workflow 或 Run 详情",
   builder: (yargs) => yargs.positional("identifier", {
-    describe: "Workflow 名称或 Run ID",
+    describe: "Workflow 名称或 Run ID (Task #1837: runId == sessionId)",
     type: "string",
     demandOption: true
   }).option("run-id", {
@@ -19528,7 +19528,7 @@ var WorkflowGetCommand = {
       }
       const service = workflowComponent.getService();
       const tool = createWorkflowGetTool(service);
-      const isRunId = args.runId || args.identifier.startsWith("run_");
+      const isRunId = args.runId || args.identifier.startsWith("workflow_run_") || args.identifier.startsWith("workflow_") || args.identifier.startsWith("run_");
       if (isRunId) {
         const result = await tool.execute({ run_id: args.identifier }, {});
         if (!result.success) {
@@ -19868,42 +19868,23 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
     if (args.session) {
       const sessionId = args.session;
       output.log(chalk70.blue(`\uD83D\uDD04 Resuming workflow from session: ${sessionId}`));
-      const sessionComponent = workflowComponent.sessionComponent;
-      if (!sessionComponent) {
-        output.error("SessionComponent not available");
-        process.exit(1);
-      }
-      const session = await sessionComponent.get(sessionId);
-      if (!session) {
-        output.error(`Session not found: ${sessionId}`);
-        process.exit(1);
-      }
-      const metadata = session.metadata;
-      if (metadata?.type !== "workflow") {
-        output.error(`Session is not a workflow session: ${sessionId}`);
-        process.exit(1);
-      }
-      const workflowName = metadata.workflowName;
-      if (!workflowName) {
-        output.error("Workflow name not found in session metadata");
-        process.exit(1);
-      }
-      const workflow = service.getWorkflowByName(workflowName);
-      if (!workflow) {
-        output.error(`Workflow not found: ${workflowName}`);
-        process.exit(1);
+      try {
+        const resumeInput = typeof input === "string" ? { userQuery: input } : input;
+        const result = await service.resumeSession(sessionId, {
+          ...runOptions,
+          ...resumeInput !== undefined ? { input: resumeInput } : {}
+        });
+        output.log(renderRunResult({
+          runId: sessionId,
+          status: result.status,
+          output: result.output,
+          error: result.error,
+          durationMs: result.durationMs
+        }));
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        output.error(`Failed to resume session ${sessionId}: ${msg}`);
       }
-      const engine = service.engineFactory(workflow);
-      const result = await engine.run(sessionId, {
-        input: input || undefined
-      });
-      output.log(renderRunResult({
-        runId: sessionId,
-        status: result.status,
-        output: result.output,
-        error: result.error,
-        durationMs: result.durationMs
-      }));
       if (workflowSpan) {
         workflowSpan.end();
       }
@@ -19960,7 +19941,14 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         timeout: args.timeout
       }, {});
       if (!toolResult.success) {
+        const outAny = toolResult.output;
+        const runId = typeof outAny === "object" && outAny !== null && "run_id" in outAny ? outAny.run_id : undefined;
         output.error(toolResult.error || `Failed to run workflow: ${args.identifier}`);
+        if (runId) {
+          output.error(`Run ID: ${runId}`);
+          output.error(chalk70.gray(`
+\uD83D\uDCA1 Use "roy-agent workflow status ${runId}" to check progress, or "roy-agent workflow run ${args.identifier} --session ${runId}" to resume`));
+        }
         process.exit(1);
       }
       const runData = toolResult.output;
@@ -20037,7 +20025,7 @@ var WorkflowRunCommand = {
     type: "string"
   }).option("session", {
     alias: "s",
-    describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复，session ID 必须以 workflow_ 开头）",
+    describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复；runId == sessionId，传 workflow run 的 runId 即可）",
     type: "string"
   }),
   handler: runWorkflow
@@ -20082,7 +20070,7 @@ var WorkflowStopCommand = {
   command: "stop <runId>",
   describe: "停止运行中的 Workflow",
   builder: (yargs) => yargs.positional("runId", {
-    describe: "Run ID",
+    describe: "Workflow run ID (== session ID, Task #1837)",
     type: "string",
     demandOption: true
   }).option("config", {
@@ -20099,7 +20087,7 @@ var WorkflowStatusCommand = {
   command: "status <runId>",
   describe: "查看 Workflow 运行状态",
   builder: (yargs) => yargs.positional("runId", {
-    describe: "Run ID",
+    describe: "Workflow run ID (== session ID, Task #1837)",
     type: "string",
     demandOption: true
   }).option("watch", {

package/dist/index.js

@@ -7426,7 +7426,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.115",
+    version: "1.5.117",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -19481,7 +19481,7 @@ var WorkflowGetCommand = {
   command: "get <identifier>",
   describe: "获取 Workflow 或 Run 详情",
   builder: (yargs) => yargs.positional("identifier", {
-    describe: "Workflow 名称或 Run ID",
+    describe: "Workflow 名称或 Run ID (Task #1837: runId == sessionId)",
     type: "string",
     demandOption: true
   }).option("run-id", {
@@ -19527,7 +19527,7 @@ var WorkflowGetCommand = {
       }
       const service = workflowComponent.getService();
       const tool = createWorkflowGetTool(service);
-      const isRunId = args.runId || args.identifier.startsWith("run_");
+      const isRunId = args.runId || args.identifier.startsWith("workflow_run_") || args.identifier.startsWith("workflow_") || args.identifier.startsWith("run_");
       if (isRunId) {
         const result = await tool.execute({ run_id: args.identifier }, {});
         if (!result.success) {
@@ -19867,42 +19867,23 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
     if (args.session) {
       const sessionId = args.session;
       output.log(chalk70.blue(`\uD83D\uDD04 Resuming workflow from session: ${sessionId}`));
-      const sessionComponent = workflowComponent.sessionComponent;
-      if (!sessionComponent) {
-        output.error("SessionComponent not available");
-        process.exit(1);
-      }
-      const session = await sessionComponent.get(sessionId);
-      if (!session) {
-        output.error(`Session not found: ${sessionId}`);
-        process.exit(1);
-      }
-      const metadata = session.metadata;
-      if (metadata?.type !== "workflow") {
-        output.error(`Session is not a workflow session: ${sessionId}`);
-        process.exit(1);
-      }
-      const workflowName = metadata.workflowName;
-      if (!workflowName) {
-        output.error("Workflow name not found in session metadata");
-        process.exit(1);
-      }
-      const workflow = service.getWorkflowByName(workflowName);
-      if (!workflow) {
-        output.error(`Workflow not found: ${workflowName}`);
-        process.exit(1);
+      try {
+        const resumeInput = typeof input === "string" ? { userQuery: input } : input;
+        const result = await service.resumeSession(sessionId, {
+          ...runOptions,
+          ...resumeInput !== undefined ? { input: resumeInput } : {}
+        });
+        output.log(renderRunResult({
+          runId: sessionId,
+          status: result.status,
+          output: result.output,
+          error: result.error,
+          durationMs: result.durationMs
+        }));
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        output.error(`Failed to resume session ${sessionId}: ${msg}`);
       }
-      const engine = service.engineFactory(workflow);
-      const result = await engine.run(sessionId, {
-        input: input || undefined
-      });
-      output.log(renderRunResult({
-        runId: sessionId,
-        status: result.status,
-        output: result.output,
-        error: result.error,
-        durationMs: result.durationMs
-      }));
       if (workflowSpan) {
         workflowSpan.end();
       }
@@ -19959,7 +19940,14 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         timeout: args.timeout
       }, {});
       if (!toolResult.success) {
+        const outAny = toolResult.output;
+        const runId = typeof outAny === "object" && outAny !== null && "run_id" in outAny ? outAny.run_id : undefined;
         output.error(toolResult.error || `Failed to run workflow: ${args.identifier}`);
+        if (runId) {
+          output.error(`Run ID: ${runId}`);
+          output.error(chalk70.gray(`
+\uD83D\uDCA1 Use "roy-agent workflow status ${runId}" to check progress, or "roy-agent workflow run ${args.identifier} --session ${runId}" to resume`));
+        }
         process.exit(1);
       }
       const runData = toolResult.output;
@@ -20036,7 +20024,7 @@ var WorkflowRunCommand = {
     type: "string"
   }).option("session", {
     alias: "s",
-    describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复，session ID 必须以 workflow_ 开头）",
+    describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复；runId == sessionId，传 workflow run 的 runId 即可）",
     type: "string"
   }),
   handler: runWorkflow
@@ -20081,7 +20069,7 @@ var WorkflowStopCommand = {
   command: "stop <runId>",
   describe: "停止运行中的 Workflow",
   builder: (yargs) => yargs.positional("runId", {
-    describe: "Run ID",
+    describe: "Workflow run ID (== session ID, Task #1837)",
     type: "string",
     demandOption: true
   }).option("config", {
@@ -20098,7 +20086,7 @@ var WorkflowStatusCommand = {
   command: "status <runId>",
   describe: "查看 Workflow 运行状态",
   builder: (yargs) => yargs.positional("runId", {
-    describe: "Run ID",
+    describe: "Workflow run ID (== session ID, Task #1837)",
     type: "string",
     demandOption: true
   }).option("watch", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.115",
+  "version": "1.5.117",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",