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

package/dist/bin/roy-agent.js

@@ -81,6 +81,7 @@ function abortStream() {
 
 class StreamOutputService {
   fullText = "";
+  fullReasoning = "";
   options;
   usageInfo;
   contextWindow;
@@ -91,6 +92,9 @@ class StreamOutputService {
   constructor(options = {}) {
     this.options = options;
   }
+  setOptions(options) {
+    this.options = { ...this.options, ...options };
+  }
   setContextInfo(window, threshold) {
     this.contextWindow = window;
     this.contextThreshold = threshold;
@@ -119,9 +123,15 @@ ${COLORS.system("[已中断]")}
       case "llm.reasoning":
         this.handleReasoning(payload);
         break;
-      case "llm.tool_call":
+      case "tool.call":
         this.handleToolCall(payload);
         break;
+      case "tool.result":
+        this.handleToolResult(payload);
+        break;
+      case "tool.error":
+        this.handleToolError(payload);
+        break;
       case "llm.completed":
         this.handleCompleted(payload);
         break;
@@ -130,11 +140,23 @@ ${COLORS.system("[已中断]")}
   handleStart(payload) {
     if (payload.metadata?.model) {}
   }
-  handleText(payload) {
+  clearThinkingPlaceholder() {
     if (!this.thinkingPrinted) {
       this.thinkingPrinted = true;
       process.stdout.write("\r" + " ".repeat(20) + "\r");
     }
+  }
+  closeReasoningBlock() {
+    if (this.reasoningStarted) {
+      process.stdout.write(COLORS.reasoning(`
+└` + "─".repeat(20) + `
+`));
+      this.reasoningStarted = false;
+    }
+  }
+  handleText(payload) {
+    this.clearThinkingPlaceholder();
+    this.closeReasoningBlock();
     const text = payload.delta ?? payload.content ?? "";
     if (!text)
       return;
@@ -147,11 +169,16 @@ ${COLORS.system("[已中断]")}
     this.fullText += text;
   }
   handleReasoning(payload) {
+    if (payload.phase === "end") {
+      this.closeReasoningBlock();
+      return;
+    }
     if (!this.options.showReasoning)
       return;
-    const content = payload.content ?? "";
-    if (!content)
+    const delta = payload.delta ?? this.extractReasoningDelta(payload.content);
+    if (!delta)
       return;
+    this.clearThinkingPlaceholder();
     if (!this.reasoningStarted) {
       this.reasoningStarted = true;
       process.stdout.write(`
@@ -159,26 +186,48 @@ ${COLORS.system("[已中断]")}
 ` + COLORS.reasoning("┌─ 思考过程 ─") + `
 `);
     }
-    process.stdout.write(COLORS.reasoning(content));
+    process.stdout.write(COLORS.reasoning(delta));
+    this.fullReasoning += delta;
+  }
+  extractReasoningDelta(content) {
+    if (!content)
+      return "";
+    if (content.startsWith(this.fullReasoning)) {
+      return content.slice(this.fullReasoning.length);
+    }
+    return "";
   }
   handleToolCall(payload) {
     if (!this.options.showToolCalls)
       return;
-    const toolCall = payload.toolCall;
-    if (toolCall?.name) {
-      process.stdout.write(`
-` + COLORS.toolCall(`\uD83D\uDD27 [Tool] ${toolCall.name}`) + `
+    const name = payload.name ?? "unknown";
+    const argsStr = payload.arguments ? JSON.stringify(payload.arguments) : "";
+    this.clearThinkingPlaceholder();
+    this.closeReasoningBlock();
+    process.stdout.write(`
+` + COLORS.toolCall(`\uD83D\uDD27 [Tool] ${name}${argsStr ? ` ${argsStr}` : ""}`) + `
+`);
+  }
+  handleToolResult(payload) {
+    if (!this.options.showToolResults)
+      return;
+    const name = payload.name ?? "unknown";
+    const result = payload.result?.output ?? payload.result?.error ?? "无输出";
+    process.stdout.write(`
+` + COLORS.toolResult(`\uD83D\uDCE4 ${name}: ${String(result).substring(0, 200)}`) + `
+`);
+  }
+  handleToolError(payload) {
+    if (!this.options.showToolCalls && !this.options.showToolResults)
+      return;
+    process.stdout.write(`
+` + COLORS.error(`❌ ${payload.toolName ?? "unknown"}: ${payload.error ?? "unknown error"}`) + `
 `);
-    }
   }
   handleCompleted(payload) {
     process.stdout.write(`
 `);
-    if (this.reasoningStarted) {
-      process.stdout.write(COLORS.reasoning("└" + "─".repeat(20) + `
-`));
-      this.reasoningStarted = false;
-    }
+    this.closeReasoningBlock();
     const metadata = payload.metadata;
     if (metadata?.model || metadata?.usage) {
       let modelName = metadata.model || "";
@@ -221,6 +270,7 @@ ${COLORS.system("[已中断]")}
   }
   reset() {
     this.fullText = "";
+    this.fullReasoning = "";
     this.usageInfo = undefined;
     this.isFirstText = true;
     this.reasoningStarted = false;
@@ -7240,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.44",
+    version: "1.5.46",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7266,9 +7316,9 @@ var require_package = __commonJS((exports, module) => {
       typecheck: "npx tsc --noEmit --skipLibCheck"
     },
     dependencies: {
-      "@ai-setting/roy-agent-coder-harness": "^1.5.41",
-      "@ai-setting/roy-agent-core": "^1.5.44",
-      "@ai-setting/roy-agent-ontology-harness": "^1.5.41",
+      "@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",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8256,11 +8306,11 @@ function createActCommand(externalEnvService) {
       alias: "r",
       describe: "显示 AI 思考过程",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-calls", {
       describe: "显示工具调用",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-results", {
       describe: "显示工具执行结果",
       type: "boolean",
@@ -8446,32 +8496,15 @@ function createActCommand(externalEnvService) {
           "llm.start",
           "llm.text",
           "llm.reasoning",
-          "llm.tool_call",
           "llm.completed",
           "llm.error",
+          "tool.call",
           "tool.result",
           "tool.error",
           "context.threshold_exceeded",
           "context.compacting",
           "context.compacted"
         ], (event) => {
-          if (event.type === "llm.tool_call" && args.toolCalls) {
-            const payload = event.payload;
-            output.log(`\uD83D\uDD27 ${payload.toolCall.name}`);
-            output.log(`   ${payload.toolCall.arguments}`);
-            return;
-          }
-          if (event.type === "tool.result" && args.toolResults) {
-            const payload = event.payload;
-            const result2 = payload.result?.output ?? payload.result?.error ?? "无输出";
-            output.log(`\uD83D\uDCE4 ${payload.name}: ${String(result2).substring(0, 200)}`);
-            return;
-          }
-          if (event.type === "tool.error") {
-            const payload = event.payload;
-            output.error(`❌ ${payload.toolName ?? "unknown"}: ${payload.error ?? "unknown error"}`);
-            return;
-          }
           if (event.type === "context.threshold_exceeded" && !quiet) {
             const payload = event.payload;
             output.warn(`⚙ 上下文阈值 (${payload.totalTokens}/${payload.contextWindow})`);
@@ -8635,8 +8668,8 @@ class QueryExecutor {
   streamService = null;
   unsubscribe = null;
   streamOptions = {
-    showReasoning: false,
-    showToolCalls: false,
+    showReasoning: true,
+    showToolCalls: true,
     showToolResults: false
   };
   _pendingContextConfig = null;
@@ -8656,10 +8689,13 @@ class QueryExecutor {
     }
   }
   subscribeToEvents(options) {
+    this.streamOptions = options;
+    if (this.streamService) {
+      this.streamService.setOptions(options);
+    }
     if (this.unsubscribe) {
       return;
     }
-    this.streamOptions = options;
     this.streamService = new StreamOutputService(options);
     if (this._pendingContextConfig) {
       this.streamService.setContextInfo(this._pendingContextConfig.contextWindow, this._pendingContextConfig.contextWindow * this._pendingContextConfig.thresholdRatio);
@@ -8669,9 +8705,9 @@ class QueryExecutor {
       "llm.start",
       "llm.text",
       "llm.reasoning",
-      "llm.tool_call",
       "llm.completed",
       "llm.error",
+      "tool.call",
       "tool.result",
       "tool.error",
       "context.threshold_exceeded",
@@ -8680,21 +8716,6 @@ class QueryExecutor {
     ], (event) => this.handleEvent(event));
   }
   handleEvent(event) {
-    if (event.type === "llm.tool_call" && this.streamOptions.showToolCalls) {
-      const payload = event.payload;
-      this.output.log(`\uD83D\uDD27 ${payload.toolCall.name}`);
-      return;
-    }
-    if (event.type === "tool.result" && this.streamOptions.showToolResults) {
-      const payload = event.payload;
-      const result = payload.result?.output ?? payload.result?.error ?? "无输出";
-      this.output.log(`\uD83D\uDCE4 ${payload.name}: ${String(result).substring(0, 200)}`);
-      return;
-    }
-    if (event.type === "tool.error") {
-      this.output.error(`❌ ${event.payload.toolName}: ${event.payload.error}`);
-      return;
-    }
     if (event.type === "context.threshold_exceeded" && !this.quiet) {
       const payload = event.payload;
       this.output.warn(`⚙ 上下文阈值 (${payload.totalTokens}/${payload.contextWindow})`);
@@ -8713,9 +8734,8 @@ class QueryExecutor {
       showToolCalls: streamOptions?.showToolCalls ?? this.streamOptions.showToolCalls,
       showToolResults: streamOptions?.showToolResults ?? this.streamOptions.showToolResults
     };
-    if (!this.unsubscribe) {
-      this.subscribeToEvents(options);
-    }
+    this.subscribeToEvents(options);
+    this.streamService?.reset();
     if (!this.quiet) {
       this.output.info(`执行: ${message}`);
     }
@@ -9583,11 +9603,11 @@ function createInteractiveCommand(externalEnvService) {
       alias: "r",
       describe: "显示 AI 思考过程",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-calls", {
       describe: "显示工具调用",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-results", {
       describe: "显示工具执行结果",
       type: "boolean",
@@ -17454,7 +17474,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       try {
         input = JSON.parse(args.input);
       } catch {
-        input = undefined;
+        input = args.sessionId ? args.input : undefined;
       }
     }
     const runOptions = {

package/dist/index.js

@@ -80,6 +80,7 @@ function abortStream() {
 
 class StreamOutputService {
   fullText = "";
+  fullReasoning = "";
   options;
   usageInfo;
   contextWindow;
@@ -90,6 +91,9 @@ class StreamOutputService {
   constructor(options = {}) {
     this.options = options;
   }
+  setOptions(options) {
+    this.options = { ...this.options, ...options };
+  }
   setContextInfo(window, threshold) {
     this.contextWindow = window;
     this.contextThreshold = threshold;
@@ -118,9 +122,15 @@ ${COLORS.system("[已中断]")}
       case "llm.reasoning":
         this.handleReasoning(payload);
         break;
-      case "llm.tool_call":
+      case "tool.call":
         this.handleToolCall(payload);
         break;
+      case "tool.result":
+        this.handleToolResult(payload);
+        break;
+      case "tool.error":
+        this.handleToolError(payload);
+        break;
       case "llm.completed":
         this.handleCompleted(payload);
         break;
@@ -129,11 +139,23 @@ ${COLORS.system("[已中断]")}
   handleStart(payload) {
     if (payload.metadata?.model) {}
   }
-  handleText(payload) {
+  clearThinkingPlaceholder() {
     if (!this.thinkingPrinted) {
       this.thinkingPrinted = true;
       process.stdout.write("\r" + " ".repeat(20) + "\r");
     }
+  }
+  closeReasoningBlock() {
+    if (this.reasoningStarted) {
+      process.stdout.write(COLORS.reasoning(`
+└` + "─".repeat(20) + `
+`));
+      this.reasoningStarted = false;
+    }
+  }
+  handleText(payload) {
+    this.clearThinkingPlaceholder();
+    this.closeReasoningBlock();
     const text = payload.delta ?? payload.content ?? "";
     if (!text)
       return;
@@ -146,11 +168,16 @@ ${COLORS.system("[已中断]")}
     this.fullText += text;
   }
   handleReasoning(payload) {
+    if (payload.phase === "end") {
+      this.closeReasoningBlock();
+      return;
+    }
     if (!this.options.showReasoning)
       return;
-    const content = payload.content ?? "";
-    if (!content)
+    const delta = payload.delta ?? this.extractReasoningDelta(payload.content);
+    if (!delta)
       return;
+    this.clearThinkingPlaceholder();
     if (!this.reasoningStarted) {
       this.reasoningStarted = true;
       process.stdout.write(`
@@ -158,26 +185,48 @@ ${COLORS.system("[已中断]")}
 ` + COLORS.reasoning("┌─ 思考过程 ─") + `
 `);
     }
-    process.stdout.write(COLORS.reasoning(content));
+    process.stdout.write(COLORS.reasoning(delta));
+    this.fullReasoning += delta;
+  }
+  extractReasoningDelta(content) {
+    if (!content)
+      return "";
+    if (content.startsWith(this.fullReasoning)) {
+      return content.slice(this.fullReasoning.length);
+    }
+    return "";
   }
   handleToolCall(payload) {
     if (!this.options.showToolCalls)
       return;
-    const toolCall = payload.toolCall;
-    if (toolCall?.name) {
-      process.stdout.write(`
-` + COLORS.toolCall(`\uD83D\uDD27 [Tool] ${toolCall.name}`) + `
+    const name = payload.name ?? "unknown";
+    const argsStr = payload.arguments ? JSON.stringify(payload.arguments) : "";
+    this.clearThinkingPlaceholder();
+    this.closeReasoningBlock();
+    process.stdout.write(`
+` + COLORS.toolCall(`\uD83D\uDD27 [Tool] ${name}${argsStr ? ` ${argsStr}` : ""}`) + `
+`);
+  }
+  handleToolResult(payload) {
+    if (!this.options.showToolResults)
+      return;
+    const name = payload.name ?? "unknown";
+    const result = payload.result?.output ?? payload.result?.error ?? "无输出";
+    process.stdout.write(`
+` + COLORS.toolResult(`\uD83D\uDCE4 ${name}: ${String(result).substring(0, 200)}`) + `
+`);
+  }
+  handleToolError(payload) {
+    if (!this.options.showToolCalls && !this.options.showToolResults)
+      return;
+    process.stdout.write(`
+` + COLORS.error(`❌ ${payload.toolName ?? "unknown"}: ${payload.error ?? "unknown error"}`) + `
 `);
-    }
   }
   handleCompleted(payload) {
     process.stdout.write(`
 `);
-    if (this.reasoningStarted) {
-      process.stdout.write(COLORS.reasoning("└" + "─".repeat(20) + `
-`));
-      this.reasoningStarted = false;
-    }
+    this.closeReasoningBlock();
     const metadata = payload.metadata;
     if (metadata?.model || metadata?.usage) {
       let modelName = metadata.model || "";
@@ -220,6 +269,7 @@ ${COLORS.system("[已中断]")}
   }
   reset() {
     this.fullText = "";
+    this.fullReasoning = "";
     this.usageInfo = undefined;
     this.isFirstText = true;
     this.reasoningStarted = false;
@@ -7239,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.44",
+    version: "1.5.46",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7265,9 +7315,9 @@ var require_package = __commonJS((exports, module) => {
       typecheck: "npx tsc --noEmit --skipLibCheck"
     },
     dependencies: {
-      "@ai-setting/roy-agent-coder-harness": "^1.5.41",
-      "@ai-setting/roy-agent-core": "^1.5.44",
-      "@ai-setting/roy-agent-ontology-harness": "^1.5.41",
+      "@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",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8255,11 +8305,11 @@ function createActCommand(externalEnvService) {
       alias: "r",
       describe: "显示 AI 思考过程",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-calls", {
       describe: "显示工具调用",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-results", {
       describe: "显示工具执行结果",
       type: "boolean",
@@ -8445,32 +8495,15 @@ function createActCommand(externalEnvService) {
           "llm.start",
           "llm.text",
           "llm.reasoning",
-          "llm.tool_call",
           "llm.completed",
           "llm.error",
+          "tool.call",
           "tool.result",
           "tool.error",
           "context.threshold_exceeded",
           "context.compacting",
           "context.compacted"
         ], (event) => {
-          if (event.type === "llm.tool_call" && args.toolCalls) {
-            const payload = event.payload;
-            output.log(`\uD83D\uDD27 ${payload.toolCall.name}`);
-            output.log(`   ${payload.toolCall.arguments}`);
-            return;
-          }
-          if (event.type === "tool.result" && args.toolResults) {
-            const payload = event.payload;
-            const result2 = payload.result?.output ?? payload.result?.error ?? "无输出";
-            output.log(`\uD83D\uDCE4 ${payload.name}: ${String(result2).substring(0, 200)}`);
-            return;
-          }
-          if (event.type === "tool.error") {
-            const payload = event.payload;
-            output.error(`❌ ${payload.toolName ?? "unknown"}: ${payload.error ?? "unknown error"}`);
-            return;
-          }
           if (event.type === "context.threshold_exceeded" && !quiet) {
             const payload = event.payload;
             output.warn(`⚙ 上下文阈值 (${payload.totalTokens}/${payload.contextWindow})`);
@@ -8634,8 +8667,8 @@ class QueryExecutor {
   streamService = null;
   unsubscribe = null;
   streamOptions = {
-    showReasoning: false,
-    showToolCalls: false,
+    showReasoning: true,
+    showToolCalls: true,
     showToolResults: false
   };
   _pendingContextConfig = null;
@@ -8655,10 +8688,13 @@ class QueryExecutor {
     }
   }
   subscribeToEvents(options) {
+    this.streamOptions = options;
+    if (this.streamService) {
+      this.streamService.setOptions(options);
+    }
     if (this.unsubscribe) {
       return;
     }
-    this.streamOptions = options;
     this.streamService = new StreamOutputService(options);
     if (this._pendingContextConfig) {
       this.streamService.setContextInfo(this._pendingContextConfig.contextWindow, this._pendingContextConfig.contextWindow * this._pendingContextConfig.thresholdRatio);
@@ -8668,9 +8704,9 @@ class QueryExecutor {
       "llm.start",
       "llm.text",
       "llm.reasoning",
-      "llm.tool_call",
       "llm.completed",
       "llm.error",
+      "tool.call",
       "tool.result",
       "tool.error",
       "context.threshold_exceeded",
@@ -8679,21 +8715,6 @@ class QueryExecutor {
     ], (event) => this.handleEvent(event));
   }
   handleEvent(event) {
-    if (event.type === "llm.tool_call" && this.streamOptions.showToolCalls) {
-      const payload = event.payload;
-      this.output.log(`\uD83D\uDD27 ${payload.toolCall.name}`);
-      return;
-    }
-    if (event.type === "tool.result" && this.streamOptions.showToolResults) {
-      const payload = event.payload;
-      const result = payload.result?.output ?? payload.result?.error ?? "无输出";
-      this.output.log(`\uD83D\uDCE4 ${payload.name}: ${String(result).substring(0, 200)}`);
-      return;
-    }
-    if (event.type === "tool.error") {
-      this.output.error(`❌ ${event.payload.toolName}: ${event.payload.error}`);
-      return;
-    }
     if (event.type === "context.threshold_exceeded" && !this.quiet) {
       const payload = event.payload;
       this.output.warn(`⚙ 上下文阈值 (${payload.totalTokens}/${payload.contextWindow})`);
@@ -8712,9 +8733,8 @@ class QueryExecutor {
       showToolCalls: streamOptions?.showToolCalls ?? this.streamOptions.showToolCalls,
       showToolResults: streamOptions?.showToolResults ?? this.streamOptions.showToolResults
     };
-    if (!this.unsubscribe) {
-      this.subscribeToEvents(options);
-    }
+    this.subscribeToEvents(options);
+    this.streamService?.reset();
     if (!this.quiet) {
       this.output.info(`执行: ${message}`);
     }
@@ -9582,11 +9602,11 @@ function createInteractiveCommand(externalEnvService) {
       alias: "r",
       describe: "显示 AI 思考过程",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-calls", {
       describe: "显示工具调用",
       type: "boolean",
-      default: false
+      default: true
     }).option("tool-results", {
       describe: "显示工具执行结果",
       type: "boolean",
@@ -17453,7 +17473,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
       try {
         input = JSON.parse(args.input);
       } catch {
-        input = undefined;
+        input = args.sessionId ? args.input : undefined;
       }
     }
     const runOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.44",
+  "version": "1.5.46",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",
@@ -26,9 +26,9 @@
     "typecheck": "npx tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@ai-setting/roy-agent-coder-harness": "^1.5.41",
-    "@ai-setting/roy-agent-core": "^1.5.44",
-    "@ai-setting/roy-agent-ontology-harness": "^1.5.41",
+    "@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",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "effect": "^3.21.2",