@ai-setting/roy-agent-cli 1.5.46 → 1.5.48

package/dist/bin/roy-agent.js

@@ -7290,7 +7290,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.46",
+    version: "1.5.48",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7317,8 +7317,8 @@ var require_package = __commonJS((exports, module) => {
     },
     dependencies: {
       "@ai-setting/roy-agent-coder-harness": "^1.5.46",
-      "@ai-setting/roy-agent-core": "^1.5.46",
-      "@ai-setting/roy-agent-ontology-harness": "^1.5.46",
+      "@ai-setting/roy-agent-core": "^1.5.47",
+      "@ai-setting/roy-agent-ontology-harness": "^1.5.47",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8273,6 +8273,14 @@ function buildActAgentContext(agentName) {
   }
   return { agentType: agentName };
 }
+function isWorkflowPausedActResult(result) {
+  try {
+    const parsed = JSON.parse(result);
+    return parsed.status === "paused";
+  } catch {
+    return false;
+  }
+}
 
 // src/commands/act.ts
 function createActCommand(externalEnvService) {
@@ -8503,7 +8511,11 @@ function createActCommand(externalEnvService) {
           "tool.error",
           "context.threshold_exceeded",
           "context.compacting",
-          "context.compacted"
+          "context.compacted",
+          "workflow.node.start",
+          "workflow.node.completed",
+          "workflow.completed",
+          "workflow.failed"
         ], (event) => {
           if (event.type === "context.threshold_exceeded" && !quiet) {
             const payload = event.payload;
@@ -8516,6 +8528,22 @@ function createActCommand(externalEnvService) {
             const payload = event.payload;
             output.success(`✓ 已压缩 (${payload.checkpointId ?? "unknown"})`);
           }
+          if (event.type === "workflow.node.start" && !quiet) {
+            const payload = event.payload;
+            output.info(`⚙ 工作流节点: ${payload.nodeId || ""}`);
+          }
+          if (event.type === "workflow.node.completed" && !quiet) {
+            const payload = event.payload;
+            output.success(`✓ 工作流节点完成: ${payload.nodeId || ""}`);
+          }
+          if (event.type === "workflow.completed" && !quiet) {
+            output.success(`✓ 工作流执行完成`);
+          }
+          if (event.type === "workflow.failed" && !quiet) {
+            const payload = event.payload;
+            const msg = payload?.error?.message ?? "unknown error";
+            output.error(`✗ 工作流失败: ${msg}`);
+          }
           streamService.handleEvent(event);
         });
         if (!quiet) {
@@ -8560,8 +8588,15 @@ function createActCommand(externalEnvService) {
           provider.setGlobalContext(undefined);
         }
         unsubscribe();
+        if (result && result.length > 0) {
+          output.log(result);
+        }
         if (!quiet) {
-          output.success("执行完成");
+          if (isWorkflowPausedActResult(result)) {
+            output.warn("工作流已暂停，等待用户输入（见上方 resume 提示）");
+          } else {
+            output.success("执行完成");
+          }
         }
       } catch (error) {
         output.error(`执行失败: ${error instanceof Error ? error.message : String(error)}`);
@@ -12477,7 +12512,7 @@ var ListCommand4 = {
   builder: (yargs) => yargs.option("type", {
     alias: "t",
     type: "string",
-    choices: ["primary", "sub", "all"],
+    choices: ["primary", "sub", "workflow", "all"],
     default: "all",
     description: "按类型筛选"
   }).option("json", {
@@ -12523,6 +12558,7 @@ var ListCommand4 = {
             name: a.name,
             type: a.type,
             description: a.description,
+            workflow: a.workflow,
             systemPromptRef: a.systemPromptRef,
             hasInlinePrompt: !!a.systemPrompt
           })),
@@ -12534,22 +12570,24 @@ var ListCommand4 = {
         const header = [
           chalk28.bold("Name"),
           chalk28.bold("Type"),
-          chalk28.bold("Description"),
-          chalk28.bold("Source")
+          chalk28.bold("Workflow"),
+          chalk28.bold("Description")
         ].join(" | ");
         const typeColor = (type) => {
-          return type === "primary" ? chalk28.yellow : chalk28.blue;
-        };
-        const sourceColor = (agent) => {
-          return agent.systemPromptRef ? chalk28.green("[ref]") : chalk28.gray("[inline]");
+          if (type === "primary")
+            return chalk28.yellow;
+          if (type === "workflow")
+            return chalk28.magenta;
+          return chalk28.blue;
         };
         const rows = agents.map((a) => {
           const desc = (a.description || "").length > 40 ? (a.description || "").slice(0, 37) + "..." : a.description || "-";
+          const workflowDisplay = a.type === "workflow" && a.workflow ? chalk28.cyan(a.workflow.length > 30 ? a.workflow.slice(0, 27) + "..." : a.workflow) : chalk28.gray("-");
           return [
             chalk28.cyan(a.name),
             typeColor(a.type)(a.type),
-            desc,
-            sourceColor(a)
+            workflowDisplay,
+            desc
           ].join(" | ");
         });
         if (rows.length === 0) {
@@ -12624,6 +12662,7 @@ var GetCommand4 = {
           name: agent.name,
           type: agent.type,
           description: agent.description,
+          workflow: agent.workflow,
           systemPromptRef: agent.systemPromptRef,
           systemPrompt: agent.systemPrompt,
           resolvedSystemPrompt,
@@ -12646,6 +12685,16 @@ var GetCommand4 = {
           output.log(`  ${chalk29.cyan("description:")} ${agent.description}`);
         }
         output.log("");
+        if (agent.type === "workflow") {
+          output.log(chalk29.bold("Workflow:"));
+          if (agent.workflow) {
+            output.log(`  ${chalk29.cyan("workflow:")} ${agent.workflow}`);
+            output.log(`  ${chalk29.gray("→")} ${chalk29.gray(`roy-agent workflow run ${agent.workflow} --input '{"query":"..."}'`)}`);
+          } else {
+            output.log(`  ${chalk29.gray("(no workflow configured)")}`);
+          }
+          output.log("");
+        }
         output.log(chalk29.bold("System Prompt:"));
         if (agent.systemPromptRef) {
           output.log(`  ${chalk29.green("[ref]")} ${chalk29.cyan("systemPromptRef:")} ${agent.systemPromptRef}`);
@@ -12721,7 +12770,7 @@ var AddCommand = {
   }).option("type", {
     alias: "t",
     type: "string",
-    choices: ["primary", "sub"],
+    choices: ["primary", "sub", "workflow"],
     default: "sub",
     description: "Agent 类型"
   }).option("description", {
@@ -12736,6 +12785,10 @@ var AddCommand = {
   }).option("model", {
     type: "string",
     description: "使用的模型"
+  }).option("workflow", {
+    alias: "w",
+    type: "string",
+    description: "关联的 workflow 名称（仅 type=workflow 时有效）"
   }).option("allowed-tools", {
     type: "string",
     description: "允许的工具（逗号分隔）"
@@ -12768,10 +12821,15 @@ var AddCommand = {
         output.error(`Agent already exists: ${args.name}`);
         process.exit(1);
       }
+      if (args.type === "workflow" && !args.workflow) {
+        output.error(`--workflow/-w is required when type is 'workflow'`);
+        process.exit(1);
+      }
       const agent = {
         name: args.name,
         type: args.type,
         description: args.description,
+        workflow: args.workflow,
         systemPromptRef: args.systemPromptRef,
         systemPrompt: args.systemPrompt,
         model: args.model,

package/dist/index.js

@@ -7289,7 +7289,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.46",
+    version: "1.5.48",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7316,8 +7316,8 @@ var require_package = __commonJS((exports, module) => {
     },
     dependencies: {
       "@ai-setting/roy-agent-coder-harness": "^1.5.46",
-      "@ai-setting/roy-agent-core": "^1.5.46",
-      "@ai-setting/roy-agent-ontology-harness": "^1.5.46",
+      "@ai-setting/roy-agent-core": "^1.5.47",
+      "@ai-setting/roy-agent-ontology-harness": "^1.5.47",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8272,6 +8272,14 @@ function buildActAgentContext(agentName) {
   }
   return { agentType: agentName };
 }
+function isWorkflowPausedActResult(result) {
+  try {
+    const parsed = JSON.parse(result);
+    return parsed.status === "paused";
+  } catch {
+    return false;
+  }
+}
 
 // src/commands/act.ts
 function createActCommand(externalEnvService) {
@@ -8502,7 +8510,11 @@ function createActCommand(externalEnvService) {
           "tool.error",
           "context.threshold_exceeded",
           "context.compacting",
-          "context.compacted"
+          "context.compacted",
+          "workflow.node.start",
+          "workflow.node.completed",
+          "workflow.completed",
+          "workflow.failed"
         ], (event) => {
           if (event.type === "context.threshold_exceeded" && !quiet) {
             const payload = event.payload;
@@ -8515,6 +8527,22 @@ function createActCommand(externalEnvService) {
             const payload = event.payload;
             output.success(`✓ 已压缩 (${payload.checkpointId ?? "unknown"})`);
           }
+          if (event.type === "workflow.node.start" && !quiet) {
+            const payload = event.payload;
+            output.info(`⚙ 工作流节点: ${payload.nodeId || ""}`);
+          }
+          if (event.type === "workflow.node.completed" && !quiet) {
+            const payload = event.payload;
+            output.success(`✓ 工作流节点完成: ${payload.nodeId || ""}`);
+          }
+          if (event.type === "workflow.completed" && !quiet) {
+            output.success(`✓ 工作流执行完成`);
+          }
+          if (event.type === "workflow.failed" && !quiet) {
+            const payload = event.payload;
+            const msg = payload?.error?.message ?? "unknown error";
+            output.error(`✗ 工作流失败: ${msg}`);
+          }
           streamService.handleEvent(event);
         });
         if (!quiet) {
@@ -8559,8 +8587,15 @@ function createActCommand(externalEnvService) {
           provider.setGlobalContext(undefined);
         }
         unsubscribe();
+        if (result && result.length > 0) {
+          output.log(result);
+        }
         if (!quiet) {
-          output.success("执行完成");
+          if (isWorkflowPausedActResult(result)) {
+            output.warn("工作流已暂停，等待用户输入（见上方 resume 提示）");
+          } else {
+            output.success("执行完成");
+          }
         }
       } catch (error) {
         output.error(`执行失败: ${error instanceof Error ? error.message : String(error)}`);
@@ -12476,7 +12511,7 @@ var ListCommand4 = {
   builder: (yargs) => yargs.option("type", {
     alias: "t",
     type: "string",
-    choices: ["primary", "sub", "all"],
+    choices: ["primary", "sub", "workflow", "all"],
     default: "all",
     description: "按类型筛选"
   }).option("json", {
@@ -12522,6 +12557,7 @@ var ListCommand4 = {
             name: a.name,
             type: a.type,
             description: a.description,
+            workflow: a.workflow,
             systemPromptRef: a.systemPromptRef,
             hasInlinePrompt: !!a.systemPrompt
           })),
@@ -12533,22 +12569,24 @@ var ListCommand4 = {
         const header = [
           chalk28.bold("Name"),
           chalk28.bold("Type"),
-          chalk28.bold("Description"),
-          chalk28.bold("Source")
+          chalk28.bold("Workflow"),
+          chalk28.bold("Description")
         ].join(" | ");
         const typeColor = (type) => {
-          return type === "primary" ? chalk28.yellow : chalk28.blue;
-        };
-        const sourceColor = (agent) => {
-          return agent.systemPromptRef ? chalk28.green("[ref]") : chalk28.gray("[inline]");
+          if (type === "primary")
+            return chalk28.yellow;
+          if (type === "workflow")
+            return chalk28.magenta;
+          return chalk28.blue;
         };
         const rows = agents.map((a) => {
           const desc = (a.description || "").length > 40 ? (a.description || "").slice(0, 37) + "..." : a.description || "-";
+          const workflowDisplay = a.type === "workflow" && a.workflow ? chalk28.cyan(a.workflow.length > 30 ? a.workflow.slice(0, 27) + "..." : a.workflow) : chalk28.gray("-");
           return [
             chalk28.cyan(a.name),
             typeColor(a.type)(a.type),
-            desc,
-            sourceColor(a)
+            workflowDisplay,
+            desc
           ].join(" | ");
         });
         if (rows.length === 0) {
@@ -12623,6 +12661,7 @@ var GetCommand4 = {
           name: agent.name,
           type: agent.type,
           description: agent.description,
+          workflow: agent.workflow,
           systemPromptRef: agent.systemPromptRef,
           systemPrompt: agent.systemPrompt,
           resolvedSystemPrompt,
@@ -12645,6 +12684,16 @@ var GetCommand4 = {
           output.log(`  ${chalk29.cyan("description:")} ${agent.description}`);
         }
         output.log("");
+        if (agent.type === "workflow") {
+          output.log(chalk29.bold("Workflow:"));
+          if (agent.workflow) {
+            output.log(`  ${chalk29.cyan("workflow:")} ${agent.workflow}`);
+            output.log(`  ${chalk29.gray("→")} ${chalk29.gray(`roy-agent workflow run ${agent.workflow} --input '{"query":"..."}'`)}`);
+          } else {
+            output.log(`  ${chalk29.gray("(no workflow configured)")}`);
+          }
+          output.log("");
+        }
         output.log(chalk29.bold("System Prompt:"));
         if (agent.systemPromptRef) {
           output.log(`  ${chalk29.green("[ref]")} ${chalk29.cyan("systemPromptRef:")} ${agent.systemPromptRef}`);
@@ -12720,7 +12769,7 @@ var AddCommand = {
   }).option("type", {
     alias: "t",
     type: "string",
-    choices: ["primary", "sub"],
+    choices: ["primary", "sub", "workflow"],
     default: "sub",
     description: "Agent 类型"
   }).option("description", {
@@ -12735,6 +12784,10 @@ var AddCommand = {
   }).option("model", {
     type: "string",
     description: "使用的模型"
+  }).option("workflow", {
+    alias: "w",
+    type: "string",
+    description: "关联的 workflow 名称（仅 type=workflow 时有效）"
   }).option("allowed-tools", {
     type: "string",
     description: "允许的工具（逗号分隔）"
@@ -12767,10 +12820,15 @@ var AddCommand = {
         output.error(`Agent already exists: ${args.name}`);
         process.exit(1);
       }
+      if (args.type === "workflow" && !args.workflow) {
+        output.error(`--workflow/-w is required when type is 'workflow'`);
+        process.exit(1);
+      }
       const agent = {
         name: args.name,
         type: args.type,
         description: args.description,
+        workflow: args.workflow,
         systemPromptRef: args.systemPromptRef,
         systemPrompt: args.systemPrompt,
         model: args.model,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.46",
+  "version": "1.5.48",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@ai-setting/roy-agent-coder-harness": "^1.5.46",
-    "@ai-setting/roy-agent-core": "^1.5.46",
-    "@ai-setting/roy-agent-ontology-harness": "^1.5.46",
+    "@ai-setting/roy-agent-core": "^1.5.47",
+    "@ai-setting/roy-agent-ontology-harness": "^1.5.47",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "effect": "^3.21.2",