@ai-setting/roy-agent-cli 1.5.89 → 1.5.90

package/dist/bin/roy-agent.js

@@ -7320,7 +7320,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.89",
+    version: "1.5.90",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -8092,8 +8092,8 @@ class ContextHandlerService {
               }
               throw error;
             }
-            if (!compactResult.newQuery || compactResult.newQuery === query) {
-              logger3.error("Compact succeeded but produced no new query, terminating to avoid silent retry loop", {
+            if (!compactResult.newQuery) {
+              logger3.error("Compact succeeded but produced undefined query, terminating", {
                 compactCount,
                 query
               });
@@ -8185,36 +8185,14 @@ class ContextHandlerService {
   async compactSession(sessionId, originalQuery) {
     return this.compactSessionWithTwoPhases(sessionId, originalQuery);
   }
-  constructQueryWithCheckpoint(checkpoint, originalQuery) {
-    const parts = [];
-    parts.push("【会话历史摘要】");
-    parts.push(checkpoint.summary);
-    if (checkpoint.processKeyPoints.length > 0) {
-      parts.push("");
-      parts.push("【已完成的工作】");
-      checkpoint.processKeyPoints.forEach((point, i) => {
-        parts.push(`${i + 1}. ${point}`);
-      });
-    }
-    if (checkpoint.currentState) {
-      parts.push("");
-      parts.push("【当前状态】");
-      parts.push(checkpoint.currentState);
-    }
-    if (checkpoint.nextSteps.length > 0) {
-      parts.push("");
-      parts.push("【待完成的任务】");
-      checkpoint.nextSteps.forEach((step, i) => {
-        parts.push(`${i + 1}. ${step}`);
-      });
-    }
-    if (originalQuery) {
-      parts.push("");
-      parts.push("【用户新输入】");
-      parts.push(originalQuery);
+  constructQueryWithCheckpoint(_checkpoint, originalQuery) {
+    const MAX_QUERY_LENGTH = 4000;
+    if (originalQuery && originalQuery.trim().length > 0) {
+      const trimmedQuery = originalQuery.length > MAX_QUERY_LENGTH ? originalQuery.substring(0, MAX_QUERY_LENGTH) + `
+... (原始输入共 ${originalQuery.length} 字符，已截断至 ${MAX_QUERY_LENGTH})` : originalQuery;
+      return trimmedQuery;
     }
-    return parts.join(`
-`);
+    return "Please continue to work on the current task.";
   }
 }
 __legacyDecorateClassTS([
@@ -8532,10 +8510,6 @@ function createActCommand(externalEnvService) {
           output.error("Environment not available");
           process.exit(1);
         }
-        const promptComponent = env.getComponent("prompt");
-        if (llmComponent && promptComponent) {
-          sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-        }
         if (coderPluginNames.includes("lsp")) {
           try {
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
@@ -8803,9 +8777,7 @@ class QueryExecutor {
     this.output = options.output;
     this.quiet = options.quiet;
   }
-  initSummaryAgent(llmComponent, promptComponent) {
-    this.sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-  }
+  initSummaryAgent(_llmComponent, _promptComponent) {}
   initStreamOutput(llmComponent, providerId = "minimax") {
     if (llmComponent) {
       const contextConfig = llmComponent.getContextThresholdConfig(providerId);
@@ -10012,9 +9984,6 @@ function createInteractiveCommand(externalEnvService) {
         });
         const sessionResult = await sessionManager.init(args.session, args.continue);
         const { sessionId, sessionTitle } = sessionResult;
-        if (llmComponent && promptComponent) {
-          sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-        }
         const queryExecutor = new QueryExecutor({
           env,
           sessionComponent,
@@ -11049,9 +11018,7 @@ var CompactCommand = {
       }
       const llmComponent = env.getComponent("llm");
       const promptComponent = env.getComponent("prompt");
-      if (llmComponent && promptComponent) {
-        sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-      } else {
+      if (!llmComponent || !promptComponent) {
         output.error("LLMComponent or PromptComponent not available. Cannot generate checkpoint.");
         process.exit(1);
       }
@@ -18006,10 +17973,10 @@ class WorkflowValidator {
 }
 
 // src/commands/workflow/commands/add.ts
+import { validateWorkflowDefinition } from "@ai-setting/roy-agent-core/env/workflow/utils/validate-workflow-definition";
 import chalk63 from "chalk";
 import fs3 from "fs";
 import path6 from "path";
-import { createWorkflowExtractorAgent } from "@ai-setting/roy-agent-core/env/task/plugins";
 async function parseWorkflowContent(content, filename) {
   const isYaml = filename.endsWith(".yaml") || filename.endsWith(".yml");
   const isJson = filename.endsWith(".json");
@@ -18150,6 +18117,15 @@ var WorkflowAddCommand = {
         workflowName = a.name || definition.name || path6.basename(filePath);
         if (a.validate) {
           output.log(chalk63.blue("\uD83D\uDD0D Validating workflow..."));
+          const dagResult = validateWorkflowDefinition(definition);
+          if (!dagResult.valid) {
+            output.error(`
+❌ Workflow validation FAILED (${dagResult.errors.length} errors found)`);
+            dagResult.errors.forEach((msg, i) => {
+              output.error(`[Error ${i + 1}/${dagResult.errors.length}] ${msg}`);
+            });
+            process.exit(1);
+          }
           const validator = new WorkflowValidator;
           const result = validator.validate(definition);
           if (!result.valid) {
@@ -18175,12 +18151,9 @@ var WorkflowAddCommand = {
           output.error("AgentComponent not available");
           process.exit(1);
         }
-        if (!agentComponent.getAgent("workflow-extractor")) {
-          output.log(chalk63.gray("Auto-registering workflow-extractor agent..."));
-          const extractorConfig = createWorkflowExtractorAgent();
-          agentComponent.registerAgent(extractorConfig.name, extractorConfig);
-          output.log(chalk63.green(`✅ workflow-extractor agent registered
-`));
+        if (!agentComponent.getAgent("workflow-extract")) {
+          output.error("Built-in 'workflow-extract' agent is not available. This usually means the environment was not fully initialized.");
+          process.exit(1);
         }
         const prompt = `## 任务
 请根据以下描述，构建一个可复用的 Workflow。
@@ -18193,8 +18166,8 @@ ${a.desc}
 1. 先用 \`roy-agent workflow nodes\` 查看可用的节点类型
 2. 生成的 YAML 必须通过 \`roy-agent workflow validate --yaml "<yaml>"\` 验证
 3. 验证通过后才输出最终 YAML`;
-        output.log(chalk63.gray("Running workflow-extractor agent..."));
-        const result = await agentComponent.run("workflow-extractor", prompt);
+        output.log(chalk63.gray("Running workflow-extract agent..."));
+        const result = await agentComponent.run("workflow-extract", prompt);
         const agentOutput = result.finalText || "";
         definition = parseYamlFromAgentOutput(agentOutput);
         if (definition === null) {
@@ -18208,6 +18181,16 @@ Agent output:
         if (a.validate) {
           output.log(chalk63.blue(`
 \uD83D\uDD0D Validating generated workflow...`));
+          const dagResult = validateWorkflowDefinition(definition);
+          if (!dagResult.valid) {
+            output.error(`
+❌ Generated workflow validation FAILED (${dagResult.errors.length} errors found)`);
+            dagResult.errors.forEach((msg, i) => {
+              output.error(`[Error ${i + 1}/${dagResult.errors.length}] ${msg}`);
+            });
+            output.log(chalk63.yellow("请修正描述后重新尝试，或使用 --file 选项直接提供 YAML"));
+            process.exit(1);
+          }
           const validator = new WorkflowValidator;
           const result2 = validator.validate(definition);
           if (!result2.valid) {

package/dist/index.js

@@ -7319,7 +7319,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.89",
+    version: "1.5.90",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -8091,8 +8091,8 @@ class ContextHandlerService {
               }
               throw error;
             }
-            if (!compactResult.newQuery || compactResult.newQuery === query) {
-              logger3.error("Compact succeeded but produced no new query, terminating to avoid silent retry loop", {
+            if (!compactResult.newQuery) {
+              logger3.error("Compact succeeded but produced undefined query, terminating", {
                 compactCount,
                 query
               });
@@ -8184,36 +8184,14 @@ class ContextHandlerService {
   async compactSession(sessionId, originalQuery) {
     return this.compactSessionWithTwoPhases(sessionId, originalQuery);
   }
-  constructQueryWithCheckpoint(checkpoint, originalQuery) {
-    const parts = [];
-    parts.push("【会话历史摘要】");
-    parts.push(checkpoint.summary);
-    if (checkpoint.processKeyPoints.length > 0) {
-      parts.push("");
-      parts.push("【已完成的工作】");
-      checkpoint.processKeyPoints.forEach((point, i) => {
-        parts.push(`${i + 1}. ${point}`);
-      });
-    }
-    if (checkpoint.currentState) {
-      parts.push("");
-      parts.push("【当前状态】");
-      parts.push(checkpoint.currentState);
-    }
-    if (checkpoint.nextSteps.length > 0) {
-      parts.push("");
-      parts.push("【待完成的任务】");
-      checkpoint.nextSteps.forEach((step, i) => {
-        parts.push(`${i + 1}. ${step}`);
-      });
-    }
-    if (originalQuery) {
-      parts.push("");
-      parts.push("【用户新输入】");
-      parts.push(originalQuery);
+  constructQueryWithCheckpoint(_checkpoint, originalQuery) {
+    const MAX_QUERY_LENGTH = 4000;
+    if (originalQuery && originalQuery.trim().length > 0) {
+      const trimmedQuery = originalQuery.length > MAX_QUERY_LENGTH ? originalQuery.substring(0, MAX_QUERY_LENGTH) + `
+... (原始输入共 ${originalQuery.length} 字符，已截断至 ${MAX_QUERY_LENGTH})` : originalQuery;
+      return trimmedQuery;
     }
-    return parts.join(`
-`);
+    return "Please continue to work on the current task.";
   }
 }
 __legacyDecorateClassTS([
@@ -8531,10 +8509,6 @@ function createActCommand(externalEnvService) {
           output.error("Environment not available");
           process.exit(1);
         }
-        const promptComponent = env.getComponent("prompt");
-        if (llmComponent && promptComponent) {
-          sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-        }
         if (coderPluginNames.includes("lsp")) {
           try {
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
@@ -8802,9 +8776,7 @@ class QueryExecutor {
     this.output = options.output;
     this.quiet = options.quiet;
   }
-  initSummaryAgent(llmComponent, promptComponent) {
-    this.sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-  }
+  initSummaryAgent(_llmComponent, _promptComponent) {}
   initStreamOutput(llmComponent, providerId = "minimax") {
     if (llmComponent) {
       const contextConfig = llmComponent.getContextThresholdConfig(providerId);
@@ -10011,9 +9983,6 @@ function createInteractiveCommand(externalEnvService) {
         });
         const sessionResult = await sessionManager.init(args.session, args.continue);
         const { sessionId, sessionTitle } = sessionResult;
-        if (llmComponent && promptComponent) {
-          sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-        }
         const queryExecutor = new QueryExecutor({
           env,
           sessionComponent,
@@ -11048,9 +11017,7 @@ var CompactCommand = {
       }
       const llmComponent = env.getComponent("llm");
       const promptComponent = env.getComponent("prompt");
-      if (llmComponent && promptComponent) {
-        sessionComponent.setSummaryComponents(promptComponent, llmComponent);
-      } else {
+      if (!llmComponent || !promptComponent) {
         output.error("LLMComponent or PromptComponent not available. Cannot generate checkpoint.");
         process.exit(1);
       }
@@ -18005,10 +17972,10 @@ class WorkflowValidator {
 }
 
 // src/commands/workflow/commands/add.ts
+import { validateWorkflowDefinition } from "@ai-setting/roy-agent-core/env/workflow/utils/validate-workflow-definition";
 import chalk63 from "chalk";
 import fs3 from "fs";
 import path6 from "path";
-import { createWorkflowExtractorAgent } from "@ai-setting/roy-agent-core/env/task/plugins";
 async function parseWorkflowContent(content, filename) {
   const isYaml = filename.endsWith(".yaml") || filename.endsWith(".yml");
   const isJson = filename.endsWith(".json");
@@ -18149,6 +18116,15 @@ var WorkflowAddCommand = {
         workflowName = a.name || definition.name || path6.basename(filePath);
         if (a.validate) {
           output.log(chalk63.blue("\uD83D\uDD0D Validating workflow..."));
+          const dagResult = validateWorkflowDefinition(definition);
+          if (!dagResult.valid) {
+            output.error(`
+❌ Workflow validation FAILED (${dagResult.errors.length} errors found)`);
+            dagResult.errors.forEach((msg, i) => {
+              output.error(`[Error ${i + 1}/${dagResult.errors.length}] ${msg}`);
+            });
+            process.exit(1);
+          }
           const validator = new WorkflowValidator;
           const result = validator.validate(definition);
           if (!result.valid) {
@@ -18174,12 +18150,9 @@ var WorkflowAddCommand = {
           output.error("AgentComponent not available");
           process.exit(1);
         }
-        if (!agentComponent.getAgent("workflow-extractor")) {
-          output.log(chalk63.gray("Auto-registering workflow-extractor agent..."));
-          const extractorConfig = createWorkflowExtractorAgent();
-          agentComponent.registerAgent(extractorConfig.name, extractorConfig);
-          output.log(chalk63.green(`✅ workflow-extractor agent registered
-`));
+        if (!agentComponent.getAgent("workflow-extract")) {
+          output.error("Built-in 'workflow-extract' agent is not available. This usually means the environment was not fully initialized.");
+          process.exit(1);
         }
         const prompt = `## 任务
 请根据以下描述，构建一个可复用的 Workflow。
@@ -18192,8 +18165,8 @@ ${a.desc}
 1. 先用 \`roy-agent workflow nodes\` 查看可用的节点类型
 2. 生成的 YAML 必须通过 \`roy-agent workflow validate --yaml "<yaml>"\` 验证
 3. 验证通过后才输出最终 YAML`;
-        output.log(chalk63.gray("Running workflow-extractor agent..."));
-        const result = await agentComponent.run("workflow-extractor", prompt);
+        output.log(chalk63.gray("Running workflow-extract agent..."));
+        const result = await agentComponent.run("workflow-extract", prompt);
         const agentOutput = result.finalText || "";
         definition = parseYamlFromAgentOutput(agentOutput);
         if (definition === null) {
@@ -18207,6 +18180,16 @@ Agent output:
         if (a.validate) {
           output.log(chalk63.blue(`
 \uD83D\uDD0D Validating generated workflow...`));
+          const dagResult = validateWorkflowDefinition(definition);
+          if (!dagResult.valid) {
+            output.error(`
+❌ Generated workflow validation FAILED (${dagResult.errors.length} errors found)`);
+            dagResult.errors.forEach((msg, i) => {
+              output.error(`[Error ${i + 1}/${dagResult.errors.length}] ${msg}`);
+            });
+            output.log(chalk63.yellow("请修正描述后重新尝试，或使用 --file 选项直接提供 YAML"));
+            process.exit(1);
+          }
           const validator = new WorkflowValidator;
           const result2 = validator.validate(definition);
           if (!result2.valid) {

package/package.json

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