@ai-setting/roy-agent-cli 1.5.5 → 1.5.7

package/dist/bin/roy-agent.js

@@ -7220,7 +7220,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.5",
+    version: "1.5.6",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -15565,6 +15565,8 @@ class WorkflowValidator {
     errors.push(...depErrors);
     const templateErrors = this.validateTemplateReferences(nodes, nodeIds);
     errors.push(...templateErrors);
+    const inputErrors = this.validateWorkflowInputs(nodes, workflow.inputs);
+    errors.push(...inputErrors);
     return {
       valid: errors.length === 0,
       errors,
@@ -15769,6 +15771,57 @@ class WorkflowValidator {
     }
     return errors;
   }
+  validateWorkflowInputs(nodes, inputs) {
+    const errors = [];
+    if (!inputs || !Array.isArray(inputs)) {
+      return errors;
+    }
+    const definedInputs = new Set(inputs.map((i) => i.name));
+    const inputTemplatePattern = /\{\{input\.([a-zA-Z_][a-zA-Z0-9_-]*)/g;
+    const dollarInputPattern = /\$\{input\.([a-zA-Z_][a-zA-Z0-9_-]*)/g;
+    const referencedInputs = new Set;
+    for (const node of nodes) {
+      if (!node.config)
+        continue;
+      const configStr = JSON.stringify(node.config);
+      let match;
+      inputTemplatePattern.lastIndex = 0;
+      while ((match = inputTemplatePattern.exec(configStr)) !== null) {
+        referencedInputs.add(match[1]);
+      }
+      dollarInputPattern.lastIndex = 0;
+      while ((match = dollarInputPattern.exec(configStr)) !== null) {
+        referencedInputs.add(match[1]);
+      }
+    }
+    for (const ref of referencedInputs) {
+      if (definedInputs.has(ref))
+        continue;
+      const hasDefault = this.inputHasDefaultFilter(ref, nodes);
+      if (hasDefault)
+        continue;
+      errors.push({
+        type: "UNDEFINED_INPUT_REFERENCE" /* UNDEFINED_INPUT_REFERENCE */,
+        description: `Template references undefined input: "${ref}"`,
+        expected: `Define "${ref}" in workflow inputs array or use default filter`,
+        actual: `{{input.${ref}}}`,
+        fix: `Add "${ref}" to the inputs array, e.g.: inputs: [{ name: "${ref}", type: "string", required: true }]`
+      });
+    }
+    return errors;
+  }
+  inputHasDefaultFilter(inputName, nodes) {
+    for (const node of nodes) {
+      if (!node.config)
+        continue;
+      const configStr = JSON.stringify(node.config);
+      const defaultFilterRegex = new RegExp("input\\." + inputName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "\\s*\\|\\s*default\\s*\\(", "g");
+      if (defaultFilterRegex.test(configStr)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
 
 // src/commands/workflow/commands/add.ts
@@ -16342,13 +16395,12 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       output.error('WorkflowService not initialized. Please run "roy-agent workflow init" first.');
       process.exit(1);
     }
-    let input = {};
+    let input;
     if (args.input) {
       try {
         input = JSON.parse(args.input);
       } catch {
-        output.error("Invalid JSON in --input option");
-        process.exit(1);
+        input = undefined;
       }
     }
     const runOptions = {
@@ -16386,7 +16438,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }
       const engine = service.engineFactory(workflow);
       const result = await engine.run(sessionId, {
-        input: args.input || undefined
+        input: input || undefined
       });
       output.log(renderRunResult({
         runId: sessionId,
@@ -16441,7 +16493,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }));
       if (result.status === "paused") {
         output.log(chalk55.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run -s ${result.runId}" to resume`));
+\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session-id ${result.runId} --input '<response>'" to resume`));
       }
     } else {
       output.log(chalk55.blue(`\uD83D\uDE80 Running workflow: ${args.identifier}`));
@@ -16455,7 +16507,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }));
       if (result.status === "paused") {
         output.log(chalk55.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run -s ${result.runId}" to resume`));
+\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session-id ${result.runId} --input '<response>'" to resume`));
       }
     }
     if (workflowSpan) {
@@ -16486,7 +16538,7 @@ var WorkflowRunCommand = {
     default: false
   }).option("input", {
     alias: "i",
-    describe: "输入参数 (JSON 格式)",
+    describe: "输入参数 (JSON 格式用于新运行，字符串用于恢复暂停的 workflow)",
     type: "string"
   }).option("parallel-limit", {
     describe: "并行限制",

package/dist/index.js

@@ -7219,7 +7219,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.5",
+    version: "1.5.6",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -15564,6 +15564,8 @@ class WorkflowValidator {
     errors.push(...depErrors);
     const templateErrors = this.validateTemplateReferences(nodes, nodeIds);
     errors.push(...templateErrors);
+    const inputErrors = this.validateWorkflowInputs(nodes, workflow.inputs);
+    errors.push(...inputErrors);
     return {
       valid: errors.length === 0,
       errors,
@@ -15768,6 +15770,57 @@ class WorkflowValidator {
     }
     return errors;
   }
+  validateWorkflowInputs(nodes, inputs) {
+    const errors = [];
+    if (!inputs || !Array.isArray(inputs)) {
+      return errors;
+    }
+    const definedInputs = new Set(inputs.map((i) => i.name));
+    const inputTemplatePattern = /\{\{input\.([a-zA-Z_][a-zA-Z0-9_-]*)/g;
+    const dollarInputPattern = /\$\{input\.([a-zA-Z_][a-zA-Z0-9_-]*)/g;
+    const referencedInputs = new Set;
+    for (const node of nodes) {
+      if (!node.config)
+        continue;
+      const configStr = JSON.stringify(node.config);
+      let match;
+      inputTemplatePattern.lastIndex = 0;
+      while ((match = inputTemplatePattern.exec(configStr)) !== null) {
+        referencedInputs.add(match[1]);
+      }
+      dollarInputPattern.lastIndex = 0;
+      while ((match = dollarInputPattern.exec(configStr)) !== null) {
+        referencedInputs.add(match[1]);
+      }
+    }
+    for (const ref of referencedInputs) {
+      if (definedInputs.has(ref))
+        continue;
+      const hasDefault = this.inputHasDefaultFilter(ref, nodes);
+      if (hasDefault)
+        continue;
+      errors.push({
+        type: "UNDEFINED_INPUT_REFERENCE" /* UNDEFINED_INPUT_REFERENCE */,
+        description: `Template references undefined input: "${ref}"`,
+        expected: `Define "${ref}" in workflow inputs array or use default filter`,
+        actual: `{{input.${ref}}}`,
+        fix: `Add "${ref}" to the inputs array, e.g.: inputs: [{ name: "${ref}", type: "string", required: true }]`
+      });
+    }
+    return errors;
+  }
+  inputHasDefaultFilter(inputName, nodes) {
+    for (const node of nodes) {
+      if (!node.config)
+        continue;
+      const configStr = JSON.stringify(node.config);
+      const defaultFilterRegex = new RegExp("input\\." + inputName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "\\s*\\|\\s*default\\s*\\(", "g");
+      if (defaultFilterRegex.test(configStr)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }
 
 // src/commands/workflow/commands/add.ts
@@ -16341,13 +16394,12 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       output.error('WorkflowService not initialized. Please run "roy-agent workflow init" first.');
       process.exit(1);
     }
-    let input = {};
+    let input;
     if (args.input) {
       try {
         input = JSON.parse(args.input);
       } catch {
-        output.error("Invalid JSON in --input option");
-        process.exit(1);
+        input = undefined;
       }
     }
     const runOptions = {
@@ -16385,7 +16437,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }
       const engine = service.engineFactory(workflow);
       const result = await engine.run(sessionId, {
-        input: args.input || undefined
+        input: input || undefined
       });
       output.log(renderRunResult({
         runId: sessionId,
@@ -16440,7 +16492,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }));
       if (result.status === "paused") {
         output.log(chalk55.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run -s ${result.runId}" to resume`));
+\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session-id ${result.runId} --input '<response>'" to resume`));
       }
     } else {
       output.log(chalk55.blue(`\uD83D\uDE80 Running workflow: ${args.identifier}`));
@@ -16454,7 +16506,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       }));
       if (result.status === "paused") {
         output.log(chalk55.gray(`
-\uD83D\uDCA1 Use "roy-agent workflow run -s ${result.runId}" to resume`));
+\uD83D\uDCA1 Use "roy-agent workflow run ${result.runId} --session-id ${result.runId} --input '<response>'" to resume`));
       }
     }
     if (workflowSpan) {
@@ -16485,7 +16537,7 @@ var WorkflowRunCommand = {
     default: false
   }).option("input", {
     alias: "i",
-    describe: "输入参数 (JSON 格式)",
+    describe: "输入参数 (JSON 格式用于新运行，字符串用于恢复暂停的 workflow)",
     type: "string"
   }).option("parallel-limit", {
     describe: "并行限制",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",
@@ -26,8 +26,8 @@
     "typecheck": "npx tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@ai-setting/roy-agent-coder-harness": "^1.5.5",
-    "@ai-setting/roy-agent-core": "^1.5.5",
+    "@ai-setting/roy-agent-coder-harness": "workspace:*",
+    "@ai-setting/roy-agent-core": "workspace:*",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "pyright": "^1.1.409",