@ai-setting/roy-agent-cli 1.5.96 → 1.5.98

package/dist/bin/roy-agent.js

@@ -7427,7 +7427,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.96",
+    version: "1.5.98",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7948,7 +7948,7 @@ class EnvironmentService {
     env.registerComponent(pluginComponent);
     await env.init();
     await env.start();
-    agentComponent.refreshDependencies();
+    await agentComponent.refreshDependencies();
     logger.debug("[EnvironmentService] AgentComponent dependencies refreshed after env.start()");
     if (options?.plugins && options.plugins.length > 0) {
       await this.loadPlugins(options.plugins);
@@ -7956,6 +7956,10 @@ class EnvironmentService {
     this.environment = env;
     return env;
   }
+  static SUB_AGENT_PROMPT_NAMES = new Set([
+    "json-extract",
+    "workflow-extract"
+  ]);
   registerCommandsPromptHook(promptComponent, commandsComponent) {
     globalHookManager.register("prompt.after-render", {
       name: "commands-prompt",
@@ -7963,6 +7967,8 @@ class EnvironmentService {
         const hookCtx = ctx.data;
         if (!hookCtx?.name || hookCtx.name === "anonymous")
           return;
+        if (EnvironmentService.SUB_AGENT_PROMPT_NAMES.has(hookCtx.name))
+          return;
         try {
           const metaList = await commandsComponent.getCommandsMeta();
           if (metaList.length === 0)
@@ -9357,6 +9363,8 @@ class EventHandler {
   isProcessing = false;
   isStopped = false;
   unsubscribe = null;
+  sessionComponent = null;
+  activeEventSessionId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -9365,6 +9373,7 @@ class EventHandler {
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
+    this.sessionComponent = options.sessionComponent ?? null;
   }
   start() {
     this.isStopped = false;
@@ -9400,6 +9409,7 @@ class EventHandler {
     }
     this.queue = [];
     this.isProcessing = false;
+    this.clearActiveSession();
   }
   handleEvent(event) {
     if (this.isStopped) {
@@ -9425,6 +9435,7 @@ class EventHandler {
   }
   async processQueue() {
     this.isProcessing = true;
+    const sessionId = await this.ensureActiveSession();
     while (!this.isStopped && this.queue.length > 0) {
       await this.waitForIdle();
       if (this.isStopped) {
@@ -9434,6 +9445,9 @@ class EventHandler {
       if (!item) {
         break;
       }
+      if (sessionId) {
+        item.eventSessionId = sessionId;
+      }
       try {
         if (this.onEventWithEnv) {
           await this.onEventWithEnv(item);
@@ -9444,8 +9458,31 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
+    this.clearActiveSession();
     this.isProcessing = false;
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return null;
+    if (this.activeEventSessionId)
+      return this.activeEventSessionId;
+    try {
+      const session = await this.sessionComponent.create({
+        title: `Event Session - ${new Date().toLocaleString("zh-CN")}`
+      });
+      this.activeEventSessionId = session.id;
+      return session.id;
+    } catch (error) {
+      console.error(`[EventHandler] 创建事件 session 失败:`, error);
+      return null;
+    }
+  }
+  clearActiveSession() {
+    this.activeEventSessionId = null;
+  }
+  getActiveEventSessionId() {
+    return this.activeEventSessionId;
+  }
   async waitForIdle() {
     while (!this.isStopped && !this.isIdle()) {
       await this.sleep(this.idleCheckInterval);
@@ -10070,7 +10107,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   async handleEventMessageWithEnv(formattedEvent) {
-    const { message, envEvent } = formattedEvent;
+    const { message, envEvent, eventSessionId } = formattedEvent;
     console.log(`
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
@@ -10090,7 +10127,8 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
       agentType: agentFromEvent,
       pluginEnabled,
       envEvent,
-      plugins
+      plugins,
+      eventSessionId
     };
     await this.executeInternal(message, { showPrompt: true });
   }
@@ -10544,7 +10582,8 @@ function createInteractiveCommand(externalEnvService) {
               model: args.model,
               ...agentContext
             };
-            const result = await queryExecutor.execute(message, sessionId, {
+            const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
+            const result = await queryExecutor.execute(message, effectiveSessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
@@ -10606,6 +10645,7 @@ function createInteractiveCommand(externalEnvService) {
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
+          sessionComponent,
           onEvent: async (message) => {
             await repl.handleEventMessage(message);
           },

package/dist/index.js

@@ -7426,7 +7426,7 @@ var require_dist = __commonJS((exports) => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@ai-setting/roy-agent-cli",
-    version: "1.5.96",
+    version: "1.5.98",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7947,7 +7947,7 @@ class EnvironmentService {
     env.registerComponent(pluginComponent);
     await env.init();
     await env.start();
-    agentComponent.refreshDependencies();
+    await agentComponent.refreshDependencies();
     logger.debug("[EnvironmentService] AgentComponent dependencies refreshed after env.start()");
     if (options?.plugins && options.plugins.length > 0) {
       await this.loadPlugins(options.plugins);
@@ -7955,6 +7955,10 @@ class EnvironmentService {
     this.environment = env;
     return env;
   }
+  static SUB_AGENT_PROMPT_NAMES = new Set([
+    "json-extract",
+    "workflow-extract"
+  ]);
   registerCommandsPromptHook(promptComponent, commandsComponent) {
     globalHookManager.register("prompt.after-render", {
       name: "commands-prompt",
@@ -7962,6 +7966,8 @@ class EnvironmentService {
         const hookCtx = ctx.data;
         if (!hookCtx?.name || hookCtx.name === "anonymous")
           return;
+        if (EnvironmentService.SUB_AGENT_PROMPT_NAMES.has(hookCtx.name))
+          return;
         try {
           const metaList = await commandsComponent.getCommandsMeta();
           if (metaList.length === 0)
@@ -9356,6 +9362,8 @@ class EventHandler {
   isProcessing = false;
   isStopped = false;
   unsubscribe = null;
+  sessionComponent = null;
+  activeEventSessionId = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -9364,6 +9372,7 @@ class EventHandler {
     this.formatter = options.formatter ?? new EventMessageFormatter;
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
+    this.sessionComponent = options.sessionComponent ?? null;
   }
   start() {
     this.isStopped = false;
@@ -9399,6 +9408,7 @@ class EventHandler {
     }
     this.queue = [];
     this.isProcessing = false;
+    this.clearActiveSession();
   }
   handleEvent(event) {
     if (this.isStopped) {
@@ -9424,6 +9434,7 @@ class EventHandler {
   }
   async processQueue() {
     this.isProcessing = true;
+    const sessionId = await this.ensureActiveSession();
     while (!this.isStopped && this.queue.length > 0) {
       await this.waitForIdle();
       if (this.isStopped) {
@@ -9433,6 +9444,9 @@ class EventHandler {
       if (!item) {
         break;
       }
+      if (sessionId) {
+        item.eventSessionId = sessionId;
+      }
       try {
         if (this.onEventWithEnv) {
           await this.onEventWithEnv(item);
@@ -9443,8 +9457,31 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
+    this.clearActiveSession();
     this.isProcessing = false;
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return null;
+    if (this.activeEventSessionId)
+      return this.activeEventSessionId;
+    try {
+      const session = await this.sessionComponent.create({
+        title: `Event Session - ${new Date().toLocaleString("zh-CN")}`
+      });
+      this.activeEventSessionId = session.id;
+      return session.id;
+    } catch (error) {
+      console.error(`[EventHandler] 创建事件 session 失败:`, error);
+      return null;
+    }
+  }
+  clearActiveSession() {
+    this.activeEventSessionId = null;
+  }
+  getActiveEventSessionId() {
+    return this.activeEventSessionId;
+  }
   async waitForIdle() {
     while (!this.isStopped && !this.isIdle()) {
       await this.sleep(this.idleCheckInterval);
@@ -10069,7 +10106,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
     await this.executeInternal(message, { showPrompt: true });
   }
   async handleEventMessageWithEnv(formattedEvent) {
-    const { message, envEvent } = formattedEvent;
+    const { message, envEvent, eventSessionId } = formattedEvent;
     console.log(`
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
@@ -10089,7 +10126,8 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
       agentType: agentFromEvent,
       pluginEnabled,
       envEvent,
-      plugins
+      plugins,
+      eventSessionId
     };
     await this.executeInternal(message, { showPrompt: true });
   }
@@ -10543,7 +10581,8 @@ function createInteractiveCommand(externalEnvService) {
               model: args.model,
               ...agentContext
             };
-            const result = await queryExecutor.execute(message, sessionId, {
+            const effectiveSessionId = mergedContext.eventSessionId ?? sessionId;
+            const result = await queryExecutor.execute(message, effectiveSessionId, {
               showReasoning: args.reasoning,
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
@@ -10605,6 +10644,7 @@ function createInteractiveCommand(externalEnvService) {
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
+          sessionComponent,
           onEvent: async (message) => {
             await repl.handleEventMessage(message);
           },

package/package.json

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