@ai-setting/roy-agent-cli 1.6.1 → 1.6.2

package/dist/bin/roy-agent.js

@@ -7407,7 +7407,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.6.1",
+    version: "1.6.2",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9762,6 +9762,68 @@ function joinResolvedSystemPrompts(prompts) {
 // src/commands/shared/ask-user-handler.ts
 import * as readline from "readline";
 import chalk3 from "chalk";
+
+// src/commands/shared/ask-user-timeout.ts
+var ASK_USER_TIMEOUT_MS = 120000;
+var ASK_USER_TIMEOUT_SENTINEL_PREFIX = "__ASK_USER_TIMEOUT__:";
+function isAskUserTimeoutSentinel(value) {
+  return typeof value === "string" && value.length > ASK_USER_TIMEOUT_SENTINEL_PREFIX.length && value.startsWith(ASK_USER_TIMEOUT_SENTINEL_PREFIX);
+}
+function createAskUserTimeoutSentinel(errorInfo, timeoutMs, extra) {
+  const payload = {
+    query: errorInfo?.query ?? extra?.question ?? "",
+    sessionId: errorInfo?.sessionId,
+    agentSessionId: errorInfo?.agentSessionId,
+    nodeId: errorInfo?.nodeId,
+    nodeType: errorInfo?.nodeType,
+    timestamp: Date.now(),
+    timeoutMs,
+    source: extra?.source ?? "repl"
+  };
+  return ASK_USER_TIMEOUT_SENTINEL_PREFIX + JSON.stringify(payload);
+}
+function withAskUserTimeoutRace(opts) {
+  const { rl, timeoutMs, onLine, onTimeout } = opts;
+  let resolved = false;
+  let timer = null;
+  const handleLine = (input) => {
+    if (resolved)
+      return;
+    resolved = true;
+    rl.removeListener("line", handleLine);
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    onLine(input);
+  };
+  rl.on("line", handleLine);
+  timer = setTimeout(() => {
+    if (resolved)
+      return;
+    resolved = true;
+    rl.removeListener("line", handleLine);
+    onTimeout();
+    timer = null;
+  }, timeoutMs);
+  if (timer && typeof timer.unref === "function") {
+    timer.unref();
+  }
+  return {
+    cancel() {
+      if (resolved)
+        return;
+      resolved = true;
+      rl.removeListener("line", handleLine);
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    }
+  };
+}
+
+// src/commands/shared/ask-user-handler.ts
 function parseOptionsFromQuery(query) {
   const optionsMatch = query.match(/\(选项:\s*(.+)\)/);
   if (optionsMatch) {
@@ -9816,7 +9878,6 @@ function parseUserInput(input, options) {
   }
   return { type: "text", value: trimmedInput };
 }
-
 // src/commands/interactive-shutdown.ts
 import { TempFileManager as TempFileManager2 } from "@ai-setting/roy-agent-core/utils/temp-file-manager";
 async function shutdownInteractiveSteps(deps) {
@@ -9963,6 +10024,7 @@ class REPL {
   sessionComponent = null;
   lastAttachPath = undefined;
   lastUsage = null;
+  askUserTimeoutMs = ASK_USER_TIMEOUT_MS;
   setLastUsage(usage) {
     this.lastUsage = usage;
   }
@@ -10350,22 +10412,27 @@ ${COLORS.error("❌ 执行失败: " + error)}
   async handleAskUserInteraction(errorInfo) {
     const { question, options } = parseOptionsFromQuery(errorInfo.query);
     console.log(formatAskUserOutput({ ...errorInfo, query: question, options }));
-    const userResponse = await this.promptUser(question, options);
+    const userResponse = await this.promptUser(question, options, errorInfo);
+    if (isAskUserTimeoutSentinel(userResponse)) {
+      console.log(chalk5.dim(`
+  请直接输入新指令继续，或使用 /abort 中断当前工作流。`));
+      return;
+    }
     console.log(COLORS.userInput(`❯ ${userResponse.replace(/\n/g, `
 ` + COLORS.userInput("❯ "))}`));
     await this.executeInternal(userResponse, { showPrompt: false });
   }
-  promptUser(question, options) {
+  promptUser(question, options, errorInfo, opts) {
+    const timeoutMs = opts?.timeoutMs ?? this.askUserTimeoutMs ?? ASK_USER_TIMEOUT_MS;
     return new Promise((resolve) => {
       this.rl.setPrompt(COLORS.userInput("❯ "));
       this.rl.prompt(true);
-      const handleLine = (input) => {
-        this.rl.removeListener("line", handleLine);
+      const finishWithUserInput = (input) => {
         const trimmedInput = input.trim();
         if (!trimmedInput) {
           console.log(chalk5.yellow(`⚠️ 输入不能为空，请重新输入
 `));
-          this.promptUser(question, options).then(resolve);
+          this.promptUser(question, options, errorInfo, opts).then(resolve);
           return;
         }
         const parsed = parseUserInput(trimmedInput, options);
@@ -10380,7 +10447,21 @@ ${COLORS.error("❌ 执行失败: " + error)}
           resolve(parsed.value);
         }
       };
-      this.rl.on("line", handleLine);
+      withAskUserTimeoutRace({
+        rl: this.rl,
+        timeoutMs,
+        onLine: (input) => {
+          finishWithUserInput(input);
+        },
+        onTimeout: () => {
+          console.log(chalk5.yellow(`
+⏱ ask_user 超时：${timeoutMs}ms 内未收到回应，已自动解除等待。`));
+          resolve(createAskUserTimeoutSentinel(errorInfo, timeoutMs, {
+            source: "repl",
+            question
+          }));
+        }
+      });
     });
   }
   handleSigint() {
@@ -18493,6 +18574,19 @@ function renderRunResult(result) {
   } else if (result.status === "stopped") {
     lines.push(chalk65.yellow(`
 ⚠️  Workflow stopped`));
+  } else if (result.status === "paused") {
+    lines.push(chalk65.yellow(`
+⏸️  Workflow paused`));
+    if (result.pendingNodeId) {
+      lines.push(chalk65.gray(`   Pending node: ${result.pendingNodeId}`));
+    }
+    if (result.query) {
+      lines.push("");
+      lines.push(chalk65.bold("\uD83D\uDCAC Agent asked: ") + chalk65.white(result.query));
+    }
+    if (result.agentSessionId) {
+      lines.push(chalk65.gray(`   Agent sub-session: ${result.agentSessionId}`));
+    }
   } else {
     lines.push(chalk65.blue(`
 \uD83D\uDD04 Workflow ${result.status}`));
@@ -19971,6 +20065,20 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         input = args.session ? args.input : undefined;
       }
     }
+    let nodeConfig;
+    if (args.nodeConfig) {
+      try {
+        const parsed = JSON.parse(args.nodeConfig);
+        if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+          output.error(`Invalid --node-config: expected a JSON object mapping nodeId → overrides, got: ${args.nodeConfig}`);
+          process.exit(1);
+        }
+        nodeConfig = parsed;
+      } catch (err) {
+        output.error(`Invalid --node-config JSON: ${err instanceof Error ? err.message : String(err)}`);
+        process.exit(1);
+      }
+    }
     if (args.session && !args.session.startsWith("workflow_")) {
       output.error(`Invalid session ID: must start with 'workflow_' (got: ${args.session})`);
       process.exit(1);
@@ -19978,7 +20086,8 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
     const runOptions = {
       debug: args.debug,
       parallelLimit: args.parallelLimit,
-      timeout: args.timeout
+      timeout: args.timeout,
+      ...nodeConfig ? { nodeConfig } : {}
     };
     const rawEnvParentId = process.env["ROY_PARENT_SESSION_ID"];
     if (typeof rawEnvParentId === "string" && rawEnvParentId.length > 0) {
@@ -20002,7 +20111,10 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
           status: result.status,
           output: result.output,
           error: result.error,
-          durationMs: result.durationMs
+          durationMs: result.durationMs,
+          ...result.pendingNodeId ? { pendingNodeId: result.pendingNodeId } : {},
+          ...result.query ? { query: result.query } : {},
+          ...result.agentSessionId ? { agentSessionId: result.agentSessionId } : {}
         }));
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -20044,24 +20156,29 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         process.exit(0);
       }
       output.log(chalk71.blue(`\uD83D\uDE80 Running workflow: ${workflow.name}`));
-      const result = await service.runWorkflow(definition, input, runOptions);
+      const fileBranchInput = typeof input === "string" ? undefined : input;
+      const result = await service.runWorkflow(definition, fileBranchInput, runOptions);
       output.log(renderRunResult({
         runId: result.runId,
         status: result.status,
         output: result.output,
         error: result.error,
-        durationMs: result.durationMs
+        durationMs: result.durationMs,
+        ...result.pendingNodeId ? { pendingNodeId: result.pendingNodeId } : {},
+        ...result.query ? { query: result.query } : {},
+        ...result.agentSessionId ? { agentSessionId: result.agentSessionId } : {}
       }));
       if (result.status === "paused") {
         output.log(chalk71.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session ${result.runId} --input '<response>'" to resume`));
+\uD83D\uDCA1 Resume with: roy-agent workflow run ${result.runId} --session ${result.runId} --input "<your answer>"`));
       }
     } else {
       const tool = createRunWorkflowTool(service);
       const toolResult = await tool.execute({
         workflow_name: args.identifier,
-        input: input || undefined,
-        timeout: args.timeout
+        input: typeof input === "string" ? undefined : input || undefined,
+        timeout: args.timeout,
+        ...nodeConfig ? { node_config: nodeConfig } : {}
       }, {});
       if (!toolResult.success) {
         const outAny = toolResult.output;
@@ -20080,11 +20197,14 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         status: runData.status,
         output: runData.output,
         error: runData.error,
-        durationMs: runData.duration_ms
+        durationMs: runData.duration_ms,
+        ...runData.pending_node_id ? { pendingNodeId: runData.pending_node_id } : {},
+        ...runData.query ? { query: runData.query } : {},
+        ...runData.agent_session_id ? { agentSessionId: runData.agent_session_id } : {}
       }));
       if (runData.status === "paused") {
         output.log(chalk71.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run ${runData.run_id} --session ${runData.run_id} --input '<response>'" to resume`));
+\uD83D\uDCA1 Resume with: roy-agent workflow run ${args.identifier} --session ${runData.run_id} --input "<your answer>"`));
       }
     }
     if (workflowSpan) {
@@ -20150,6 +20270,9 @@ var WorkflowRunCommand = {
     alias: "s",
     describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复；runId == sessionId，传 workflow run 的 runId 即可）",
     type: "string"
+  }).option("node-config", {
+    describe: `Per-node runtime config overrides (Task #1974). JSON string: { "<nodeId>": { "timeout": 5000 } }. Shallow-merged into each node's effective config; input wins over nodeDef.config.`,
+    type: "string"
   }),
   handler: runWorkflow
 };

package/dist/index.js

@@ -7406,7 +7406,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.6.1",
+    version: "1.6.2",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9761,6 +9761,68 @@ function joinResolvedSystemPrompts(prompts) {
 // src/commands/shared/ask-user-handler.ts
 import * as readline from "readline";
 import chalk3 from "chalk";
+
+// src/commands/shared/ask-user-timeout.ts
+var ASK_USER_TIMEOUT_MS = 120000;
+var ASK_USER_TIMEOUT_SENTINEL_PREFIX = "__ASK_USER_TIMEOUT__:";
+function isAskUserTimeoutSentinel(value) {
+  return typeof value === "string" && value.length > ASK_USER_TIMEOUT_SENTINEL_PREFIX.length && value.startsWith(ASK_USER_TIMEOUT_SENTINEL_PREFIX);
+}
+function createAskUserTimeoutSentinel(errorInfo, timeoutMs, extra) {
+  const payload = {
+    query: errorInfo?.query ?? extra?.question ?? "",
+    sessionId: errorInfo?.sessionId,
+    agentSessionId: errorInfo?.agentSessionId,
+    nodeId: errorInfo?.nodeId,
+    nodeType: errorInfo?.nodeType,
+    timestamp: Date.now(),
+    timeoutMs,
+    source: extra?.source ?? "repl"
+  };
+  return ASK_USER_TIMEOUT_SENTINEL_PREFIX + JSON.stringify(payload);
+}
+function withAskUserTimeoutRace(opts) {
+  const { rl, timeoutMs, onLine, onTimeout } = opts;
+  let resolved = false;
+  let timer = null;
+  const handleLine = (input) => {
+    if (resolved)
+      return;
+    resolved = true;
+    rl.removeListener("line", handleLine);
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    onLine(input);
+  };
+  rl.on("line", handleLine);
+  timer = setTimeout(() => {
+    if (resolved)
+      return;
+    resolved = true;
+    rl.removeListener("line", handleLine);
+    onTimeout();
+    timer = null;
+  }, timeoutMs);
+  if (timer && typeof timer.unref === "function") {
+    timer.unref();
+  }
+  return {
+    cancel() {
+      if (resolved)
+        return;
+      resolved = true;
+      rl.removeListener("line", handleLine);
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+    }
+  };
+}
+
+// src/commands/shared/ask-user-handler.ts
 function parseOptionsFromQuery(query) {
   const optionsMatch = query.match(/\(选项:\s*(.+)\)/);
   if (optionsMatch) {
@@ -9815,7 +9877,6 @@ function parseUserInput(input, options) {
   }
   return { type: "text", value: trimmedInput };
 }
-
 // src/commands/interactive-shutdown.ts
 import { TempFileManager as TempFileManager2 } from "@ai-setting/roy-agent-core/utils/temp-file-manager";
 async function shutdownInteractiveSteps(deps) {
@@ -9962,6 +10023,7 @@ class REPL {
   sessionComponent = null;
   lastAttachPath = undefined;
   lastUsage = null;
+  askUserTimeoutMs = ASK_USER_TIMEOUT_MS;
   setLastUsage(usage) {
     this.lastUsage = usage;
   }
@@ -10349,22 +10411,27 @@ ${COLORS.error("❌ 执行失败: " + error)}
   async handleAskUserInteraction(errorInfo) {
     const { question, options } = parseOptionsFromQuery(errorInfo.query);
     console.log(formatAskUserOutput({ ...errorInfo, query: question, options }));
-    const userResponse = await this.promptUser(question, options);
+    const userResponse = await this.promptUser(question, options, errorInfo);
+    if (isAskUserTimeoutSentinel(userResponse)) {
+      console.log(chalk5.dim(`
+  请直接输入新指令继续，或使用 /abort 中断当前工作流。`));
+      return;
+    }
     console.log(COLORS.userInput(`❯ ${userResponse.replace(/\n/g, `
 ` + COLORS.userInput("❯ "))}`));
     await this.executeInternal(userResponse, { showPrompt: false });
   }
-  promptUser(question, options) {
+  promptUser(question, options, errorInfo, opts) {
+    const timeoutMs = opts?.timeoutMs ?? this.askUserTimeoutMs ?? ASK_USER_TIMEOUT_MS;
     return new Promise((resolve) => {
       this.rl.setPrompt(COLORS.userInput("❯ "));
       this.rl.prompt(true);
-      const handleLine = (input) => {
-        this.rl.removeListener("line", handleLine);
+      const finishWithUserInput = (input) => {
         const trimmedInput = input.trim();
         if (!trimmedInput) {
           console.log(chalk5.yellow(`⚠️ 输入不能为空，请重新输入
 `));
-          this.promptUser(question, options).then(resolve);
+          this.promptUser(question, options, errorInfo, opts).then(resolve);
           return;
         }
         const parsed = parseUserInput(trimmedInput, options);
@@ -10379,7 +10446,21 @@ ${COLORS.error("❌ 执行失败: " + error)}
           resolve(parsed.value);
         }
       };
-      this.rl.on("line", handleLine);
+      withAskUserTimeoutRace({
+        rl: this.rl,
+        timeoutMs,
+        onLine: (input) => {
+          finishWithUserInput(input);
+        },
+        onTimeout: () => {
+          console.log(chalk5.yellow(`
+⏱ ask_user 超时：${timeoutMs}ms 内未收到回应，已自动解除等待。`));
+          resolve(createAskUserTimeoutSentinel(errorInfo, timeoutMs, {
+            source: "repl",
+            question
+          }));
+        }
+      });
     });
   }
   handleSigint() {
@@ -18492,6 +18573,19 @@ function renderRunResult(result) {
   } else if (result.status === "stopped") {
     lines.push(chalk65.yellow(`
 ⚠️  Workflow stopped`));
+  } else if (result.status === "paused") {
+    lines.push(chalk65.yellow(`
+⏸️  Workflow paused`));
+    if (result.pendingNodeId) {
+      lines.push(chalk65.gray(`   Pending node: ${result.pendingNodeId}`));
+    }
+    if (result.query) {
+      lines.push("");
+      lines.push(chalk65.bold("\uD83D\uDCAC Agent asked: ") + chalk65.white(result.query));
+    }
+    if (result.agentSessionId) {
+      lines.push(chalk65.gray(`   Agent sub-session: ${result.agentSessionId}`));
+    }
   } else {
     lines.push(chalk65.blue(`
 \uD83D\uDD04 Workflow ${result.status}`));
@@ -19970,6 +20064,20 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         input = args.session ? args.input : undefined;
       }
     }
+    let nodeConfig;
+    if (args.nodeConfig) {
+      try {
+        const parsed = JSON.parse(args.nodeConfig);
+        if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+          output.error(`Invalid --node-config: expected a JSON object mapping nodeId → overrides, got: ${args.nodeConfig}`);
+          process.exit(1);
+        }
+        nodeConfig = parsed;
+      } catch (err) {
+        output.error(`Invalid --node-config JSON: ${err instanceof Error ? err.message : String(err)}`);
+        process.exit(1);
+      }
+    }
     if (args.session && !args.session.startsWith("workflow_")) {
       output.error(`Invalid session ID: must start with 'workflow_' (got: ${args.session})`);
       process.exit(1);
@@ -19977,7 +20085,8 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
     const runOptions = {
       debug: args.debug,
       parallelLimit: args.parallelLimit,
-      timeout: args.timeout
+      timeout: args.timeout,
+      ...nodeConfig ? { nodeConfig } : {}
     };
     const rawEnvParentId = process.env["ROY_PARENT_SESSION_ID"];
     if (typeof rawEnvParentId === "string" && rawEnvParentId.length > 0) {
@@ -20001,7 +20110,10 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
           status: result.status,
           output: result.output,
           error: result.error,
-          durationMs: result.durationMs
+          durationMs: result.durationMs,
+          ...result.pendingNodeId ? { pendingNodeId: result.pendingNodeId } : {},
+          ...result.query ? { query: result.query } : {},
+          ...result.agentSessionId ? { agentSessionId: result.agentSessionId } : {}
         }));
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -20043,24 +20155,29 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         process.exit(0);
       }
       output.log(chalk71.blue(`\uD83D\uDE80 Running workflow: ${workflow.name}`));
-      const result = await service.runWorkflow(definition, input, runOptions);
+      const fileBranchInput = typeof input === "string" ? undefined : input;
+      const result = await service.runWorkflow(definition, fileBranchInput, runOptions);
       output.log(renderRunResult({
         runId: result.runId,
         status: result.status,
         output: result.output,
         error: result.error,
-        durationMs: result.durationMs
+        durationMs: result.durationMs,
+        ...result.pendingNodeId ? { pendingNodeId: result.pendingNodeId } : {},
+        ...result.query ? { query: result.query } : {},
+        ...result.agentSessionId ? { agentSessionId: result.agentSessionId } : {}
       }));
       if (result.status === "paused") {
         output.log(chalk71.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session ${result.runId} --input '<response>'" to resume`));
+\uD83D\uDCA1 Resume with: roy-agent workflow run ${result.runId} --session ${result.runId} --input "<your answer>"`));
       }
     } else {
       const tool = createRunWorkflowTool(service);
       const toolResult = await tool.execute({
         workflow_name: args.identifier,
-        input: input || undefined,
-        timeout: args.timeout
+        input: typeof input === "string" ? undefined : input || undefined,
+        timeout: args.timeout,
+        ...nodeConfig ? { node_config: nodeConfig } : {}
       }, {});
       if (!toolResult.success) {
         const outAny = toolResult.output;
@@ -20079,11 +20196,14 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
         status: runData.status,
         output: runData.output,
         error: runData.error,
-        durationMs: runData.duration_ms
+        durationMs: runData.duration_ms,
+        ...runData.pending_node_id ? { pendingNodeId: runData.pending_node_id } : {},
+        ...runData.query ? { query: runData.query } : {},
+        ...runData.agent_session_id ? { agentSessionId: runData.agent_session_id } : {}
       }));
       if (runData.status === "paused") {
         output.log(chalk71.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run ${runData.run_id} --session ${runData.run_id} --input '<response>'" to resume`));
+\uD83D\uDCA1 Resume with: roy-agent workflow run ${args.identifier} --session ${runData.run_id} --input "<your answer>"`));
       }
     }
     if (workflowSpan) {
@@ -20149,6 +20269,9 @@ var WorkflowRunCommand = {
     alias: "s",
     describe: "从已有 session 恢复运行（支持 workflow pause/interrupt 恢复；runId == sessionId，传 workflow run 的 runId 即可）",
     type: "string"
+  }).option("node-config", {
+    describe: `Per-node runtime config overrides (Task #1974). JSON string: { "<nodeId>": { "timeout": 5000 } }. Shallow-merged into each node's effective config; input wins over nodeDef.config.`,
+    type: "string"
   }),
   handler: runWorkflow
 };

package/package.json

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