@ai-setting/roy-agent-cli 1.5.37 → 1.5.39

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.37",
+    version: "1.5.39",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7247,7 +7247,7 @@ var require_package = __commonJS((exports, module) => {
     },
     dependencies: {
       "@ai-setting/roy-agent-coder-harness": "^1.5.36",
-      "@ai-setting/roy-agent-core": "^1.5.35",
+      "@ai-setting/roy-agent-core": "^1.5.37",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8736,7 +8736,7 @@ class QueryExecutor {
     }
     this.streamService?.handleEvent(event);
   }
-  async execute(message, sessionId, streamOptions, traceId) {
+  async execute(message, sessionId, streamOptions, traceId, agentContext) {
     const options = {
       showReasoning: streamOptions?.showReasoning ?? this.streamOptions.showReasoning,
       showToolCalls: streamOptions?.showToolCalls ?? this.streamOptions.showToolCalls,
@@ -8754,7 +8754,8 @@ class QueryExecutor {
       metadata: {
         originalQuery: message,
         traceId
-      }
+      },
+      ...agentContext
     };
     let span;
     const tracer = getTracerProvider3().getTracer("roy-tracer");
@@ -8960,6 +8961,12 @@ class EventMessageFormatter {
     const seconds = Math.floor(ms % 60000 / 1000);
     return `${minutes}分${seconds}秒`;
   }
+  formatWithEvent(event) {
+    return {
+      message: this.format(event),
+      envEvent: event
+    };
+  }
 }
 
 // src/commands/shared/event-handler.ts
@@ -8967,6 +8974,7 @@ class EventHandler {
   env;
   eventTypes;
   onEvent;
+  onEventWithEnv;
   formatter;
   isIdle;
   idleCheckInterval;
@@ -8978,6 +8986,7 @@ class EventHandler {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
     this.onEvent = options.onEvent;
+    this.onEventWithEnv = options.onEventWithEnv;
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
@@ -9021,14 +9030,14 @@ class EventHandler {
     if (this.isStopped) {
       return;
     }
-    const message = this.formatter.format(event);
-    this.enqueue(message);
+    const formatted = this.formatter.formatWithEvent(event);
+    this.enqueue(formatted);
   }
-  enqueue(message) {
+  enqueue(formattedEvent) {
     if (this.isStopped) {
       return;
     }
-    this.queue.push(message);
+    this.queue.push(formattedEvent);
     if (!this.isProcessing) {
       this.processQueue();
     }
@@ -9046,12 +9055,16 @@ class EventHandler {
       if (this.isStopped) {
         break;
       }
-      const message = this.queue.shift();
-      if (!message) {
+      const item = this.queue.shift();
+      if (!item) {
         break;
       }
       try {
-        await this.onEvent(message);
+        if (this.onEventWithEnv) {
+          await this.onEventWithEnv(item);
+          continue;
+        }
+        await this.onEvent(item.message);
       } catch (error) {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
@@ -9323,11 +9336,34 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
 `);
     await this.executeInternal(message, { showPrompt: true });
   }
+  async handleEventMessageWithEnv(formattedEvent) {
+    const { message, envEvent } = formattedEvent;
+    console.log(`
+${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
+` + COLORS.system("[通知2] ❯ ")))}
+`);
+    const sourceId = envEvent.metadata?.sourceId;
+    const plugins = envEvent.metadata?.plugins || [];
+    const pluginEnabled = {};
+    for (const pluginName of plugins) {
+      const key = `${sourceId}:${pluginName}`;
+      pluginEnabled[key] = true;
+    }
+    this.currentAgentContext = {
+      pluginEnabled,
+      envEvent,
+      plugins
+    };
+    await this.executeInternal(message, { showPrompt: true });
+  }
+  currentAgentContext = undefined;
   isIdle() {
     return !this.isExecuting;
   }
   async executeInternal(message, options) {
     this.isExecuting = true;
+    const agentContext = this.currentAgentContext;
+    this.currentAgentContext = undefined;
     resetStreamAbort();
     const provider = getTracerProvider4();
     const tracer = provider.getTracer("roy-tracer");
@@ -9337,7 +9373,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     console.log(`${COLORS.system("[Trace] " + traceId)}`);
     console.log(`${COLORS.progress("[thinking...]")}`);
     try {
-      await this.options.onExecute(message, traceId);
+      await this.options.onExecute(message, traceId, agentContext);
     } catch (error) {
       const askUserError = this.parseAskUserError(error);
       if (askUserError) {
@@ -9730,16 +9766,21 @@ function createInteractiveCommand(externalEnvService) {
             output.error(`❌ 加载 coder-harness 插件失败: ${error}`);
           }
         }
+        let currentAgentContext = undefined;
         const repl = new REPL({
           sessionId,
           sessionTitle,
-          onExecute: async (message, traceId) => {
+          onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const mergedContext = {
+              ...currentAgentContext,
+              ...agentContext
+            };
             return queryExecutor.execute(message, sessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
-            }, traceId);
+            }, traceId, mergedContext);
           },
           onStatus: async () => {
             const session = await sessionComponent.get(sessionId);
@@ -9811,6 +9852,9 @@ function createInteractiveCommand(externalEnvService) {
           isIdle: () => repl.isIdle(),
           onEvent: async (message) => {
             await repl.handleEventMessage(message);
+          },
+          onEventWithEnv: async (formattedEvent) => {
+            await repl.handleEventMessageWithEnv(formattedEvent);
           }
         });
         const stopEventHandler = eventHandler.start();

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.37",
+    version: "1.5.39",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7246,7 +7246,7 @@ var require_package = __commonJS((exports, module) => {
     },
     dependencies: {
       "@ai-setting/roy-agent-coder-harness": "^1.5.36",
-      "@ai-setting/roy-agent-core": "^1.5.35",
+      "@ai-setting/roy-agent-core": "^1.5.37",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -8735,7 +8735,7 @@ class QueryExecutor {
     }
     this.streamService?.handleEvent(event);
   }
-  async execute(message, sessionId, streamOptions, traceId) {
+  async execute(message, sessionId, streamOptions, traceId, agentContext) {
     const options = {
       showReasoning: streamOptions?.showReasoning ?? this.streamOptions.showReasoning,
       showToolCalls: streamOptions?.showToolCalls ?? this.streamOptions.showToolCalls,
@@ -8753,7 +8753,8 @@ class QueryExecutor {
       metadata: {
         originalQuery: message,
         traceId
-      }
+      },
+      ...agentContext
     };
     let span;
     const tracer = getTracerProvider3().getTracer("roy-tracer");
@@ -8959,6 +8960,12 @@ class EventMessageFormatter {
     const seconds = Math.floor(ms % 60000 / 1000);
     return `${minutes}分${seconds}秒`;
   }
+  formatWithEvent(event) {
+    return {
+      message: this.format(event),
+      envEvent: event
+    };
+  }
 }
 
 // src/commands/shared/event-handler.ts
@@ -8966,6 +8973,7 @@ class EventHandler {
   env;
   eventTypes;
   onEvent;
+  onEventWithEnv;
   formatter;
   isIdle;
   idleCheckInterval;
@@ -8977,6 +8985,7 @@ class EventHandler {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
     this.onEvent = options.onEvent;
+    this.onEventWithEnv = options.onEventWithEnv;
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
@@ -9020,14 +9029,14 @@ class EventHandler {
     if (this.isStopped) {
       return;
     }
-    const message = this.formatter.format(event);
-    this.enqueue(message);
+    const formatted = this.formatter.formatWithEvent(event);
+    this.enqueue(formatted);
   }
-  enqueue(message) {
+  enqueue(formattedEvent) {
     if (this.isStopped) {
       return;
     }
-    this.queue.push(message);
+    this.queue.push(formattedEvent);
     if (!this.isProcessing) {
       this.processQueue();
     }
@@ -9045,12 +9054,16 @@ class EventHandler {
       if (this.isStopped) {
         break;
       }
-      const message = this.queue.shift();
-      if (!message) {
+      const item = this.queue.shift();
+      if (!item) {
         break;
       }
       try {
-        await this.onEvent(message);
+        if (this.onEventWithEnv) {
+          await this.onEventWithEnv(item);
+          continue;
+        }
+        await this.onEvent(item.message);
       } catch (error) {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
@@ -9322,11 +9335,34 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
 `);
     await this.executeInternal(message, { showPrompt: true });
   }
+  async handleEventMessageWithEnv(formattedEvent) {
+    const { message, envEvent } = formattedEvent;
+    console.log(`
+${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
+` + COLORS.system("[通知2] ❯ ")))}
+`);
+    const sourceId = envEvent.metadata?.sourceId;
+    const plugins = envEvent.metadata?.plugins || [];
+    const pluginEnabled = {};
+    for (const pluginName of plugins) {
+      const key = `${sourceId}:${pluginName}`;
+      pluginEnabled[key] = true;
+    }
+    this.currentAgentContext = {
+      pluginEnabled,
+      envEvent,
+      plugins
+    };
+    await this.executeInternal(message, { showPrompt: true });
+  }
+  currentAgentContext = undefined;
   isIdle() {
     return !this.isExecuting;
   }
   async executeInternal(message, options) {
     this.isExecuting = true;
+    const agentContext = this.currentAgentContext;
+    this.currentAgentContext = undefined;
     resetStreamAbort();
     const provider = getTracerProvider4();
     const tracer = provider.getTracer("roy-tracer");
@@ -9336,7 +9372,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     console.log(`${COLORS.system("[Trace] " + traceId)}`);
     console.log(`${COLORS.progress("[thinking...]")}`);
     try {
-      await this.options.onExecute(message, traceId);
+      await this.options.onExecute(message, traceId, agentContext);
     } catch (error) {
       const askUserError = this.parseAskUserError(error);
       if (askUserError) {
@@ -9729,16 +9765,21 @@ function createInteractiveCommand(externalEnvService) {
             output.error(`❌ 加载 coder-harness 插件失败: ${error}`);
           }
         }
+        let currentAgentContext = undefined;
         const repl = new REPL({
           sessionId,
           sessionTitle,
-          onExecute: async (message, traceId) => {
+          onExecute: async (message, traceId, agentContext) => {
             resetStreamAbort();
+            const mergedContext = {
+              ...currentAgentContext,
+              ...agentContext
+            };
             return queryExecutor.execute(message, sessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
-            }, traceId);
+            }, traceId, mergedContext);
           },
           onStatus: async () => {
             const session = await sessionComponent.get(sessionId);
@@ -9810,6 +9851,9 @@ function createInteractiveCommand(externalEnvService) {
           isIdle: () => repl.isIdle(),
           onEvent: async (message) => {
             await repl.handleEventMessage(message);
+          },
+          onEventWithEnv: async (formattedEvent) => {
+            await repl.handleEventMessageWithEnv(formattedEvent);
           }
         });
         const stopEventHandler = eventHandler.start();

package/package.json

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