@ai-setting/roy-agent-cli 1.5.112 → 1.5.114

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.112",
+    version: "1.5.114",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9495,7 +9495,6 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
-    this.clearActiveSession();
     this.isProcessing = false;
   }
   async ensureActiveSession() {
@@ -9512,13 +9511,29 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          await this.sessionComponent.setActiveSession(existing.id);
           return existing.id;
         }
-        console.warn(`[EventHandler] Parent session ${triggerSessionId} not found, creating new session`);
+        console.warn(`[EventHandler] Parent session ${triggerSessionId} not found, trying global active session`);
       } catch (error) {
         console.error(`[EventHandler] Failed to lookup parent session ${triggerSessionId}:`, error);
       }
     }
+    try {
+      const activeId = this.sessionComponent.getActiveSessionId();
+      if (activeId) {
+        const existing = await this.sessionComponent.get(activeId);
+        if (existing) {
+          if (this.isStopped) {
+            return null;
+          }
+          this.activeEventSessionId = existing.id;
+          return existing.id;
+        }
+      }
+    } catch (error) {
+      console.error(`[EventHandler] Failed to lookup global active session:`, error);
+    }
     return this.createNewEventSession();
   }
   async createNewEventSession() {
@@ -9531,6 +9546,7 @@ class EventHandler {
         return null;
       }
       this.activeEventSessionId = session.id;
+      await this.sessionComponent.setActiveSession(session.id);
       return session.id;
     } catch (error) {
       console.error(`[EventHandler] 创建事件 session 失败:`, error);
@@ -9953,6 +9969,7 @@ class REPL {
   inputHandler;
   keypressHandler;
   sessionManager = null;
+  sessionComponent = null;
   lastAttachPath = undefined;
   lastUsage = null;
   setLastUsage(usage) {
@@ -10191,9 +10208,22 @@ ${COLORS.system("⏳ 上一次请求尚未完成，请稍候...")}
 `);
       return;
     }
+    await this.ensureActiveSession();
     const payload = this.sessionManager ? await this.sessionManager.getQueryPayload(message) : message;
     await this.executeInternal(payload, { showPrompt: false });
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return;
+    try {
+      const activeId = this.sessionComponent.getActiveSessionId();
+      if (!activeId && this.sessionManager) {
+        await this.sessionManager.init(undefined, false);
+      }
+    } catch (error) {
+      console.error(`[REPL] Failed to ensure active session:`, error);
+    }
+  }
   async handleEventMessage(message) {
     console.log(`
 ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
@@ -10207,6 +10237,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
 `);
+    await this.ensureActiveSession();
     const sourceId = envEvent.metadata?.sourceId;
     let pluginEnabled = envEvent.metadata?.pluginEnabled;
     let plugins = envEvent.metadata?.plugins;
@@ -10775,6 +10806,7 @@ function createInteractiveCommand(externalEnvService) {
         };
         process.on("SIGINT", sigintHandler);
         repl.sessionManager = sessionManager;
+        repl.sessionComponent = sessionComponent;
         await repl.start();
         process.removeListener("SIGINT", sigintHandler);
         console.log("正在清理资源...");
@@ -19489,7 +19521,7 @@ import fs5 from "fs";
 import path8 from "path";
 import { createRunWorkflowTool } from "@ai-setting/roy-agent-core/env/workflow/tools";
 import { getTracerProvider as getTracerProvider4, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
-import { isValidSessionId } from "@ai-setting/roy-agent-core/env/session/session-id";
+import { isValidSessionId } from "@ai-setting/roy-agent-core/env/session";
 var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   const output = new OutputService2;
   const envService = new EnvironmentService(output);

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.112",
+    version: "1.5.114",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -9494,7 +9494,6 @@ class EventHandler {
         console.error(`[EventHandler] 处理事件失败:`, error);
       }
     }
-    this.clearActiveSession();
     this.isProcessing = false;
   }
   async ensureActiveSession() {
@@ -9511,13 +9510,29 @@ class EventHandler {
             return null;
           }
           this.activeEventSessionId = existing.id;
+          await this.sessionComponent.setActiveSession(existing.id);
           return existing.id;
         }
-        console.warn(`[EventHandler] Parent session ${triggerSessionId} not found, creating new session`);
+        console.warn(`[EventHandler] Parent session ${triggerSessionId} not found, trying global active session`);
       } catch (error) {
         console.error(`[EventHandler] Failed to lookup parent session ${triggerSessionId}:`, error);
       }
     }
+    try {
+      const activeId = this.sessionComponent.getActiveSessionId();
+      if (activeId) {
+        const existing = await this.sessionComponent.get(activeId);
+        if (existing) {
+          if (this.isStopped) {
+            return null;
+          }
+          this.activeEventSessionId = existing.id;
+          return existing.id;
+        }
+      }
+    } catch (error) {
+      console.error(`[EventHandler] Failed to lookup global active session:`, error);
+    }
     return this.createNewEventSession();
   }
   async createNewEventSession() {
@@ -9530,6 +9545,7 @@ class EventHandler {
         return null;
       }
       this.activeEventSessionId = session.id;
+      await this.sessionComponent.setActiveSession(session.id);
       return session.id;
     } catch (error) {
       console.error(`[EventHandler] 创建事件 session 失败:`, error);
@@ -9952,6 +9968,7 @@ class REPL {
   inputHandler;
   keypressHandler;
   sessionManager = null;
+  sessionComponent = null;
   lastAttachPath = undefined;
   lastUsage = null;
   setLastUsage(usage) {
@@ -10190,9 +10207,22 @@ ${COLORS.system("⏳ 上一次请求尚未完成，请稍候...")}
 `);
       return;
     }
+    await this.ensureActiveSession();
     const payload = this.sessionManager ? await this.sessionManager.getQueryPayload(message) : message;
     await this.executeInternal(payload, { showPrompt: false });
   }
+  async ensureActiveSession() {
+    if (!this.sessionComponent)
+      return;
+    try {
+      const activeId = this.sessionComponent.getActiveSessionId();
+      if (!activeId && this.sessionManager) {
+        await this.sessionManager.init(undefined, false);
+      }
+    } catch (error) {
+      console.error(`[REPL] Failed to ensure active session:`, error);
+    }
+  }
   async handleEventMessage(message) {
     console.log(`
 ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
@@ -10206,6 +10236,7 @@ ${COLORS.system("[通知] ❯ " + message.replace(/\n/g, `
 ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ` + COLORS.system("[通知2] ❯ ")))}
 `);
+    await this.ensureActiveSession();
     const sourceId = envEvent.metadata?.sourceId;
     let pluginEnabled = envEvent.metadata?.pluginEnabled;
     let plugins = envEvent.metadata?.plugins;
@@ -10774,6 +10805,7 @@ function createInteractiveCommand(externalEnvService) {
         };
         process.on("SIGINT", sigintHandler);
         repl.sessionManager = sessionManager;
+        repl.sessionComponent = sessionComponent;
         await repl.start();
         process.removeListener("SIGINT", sigintHandler);
         console.log("正在清理资源...");
@@ -19488,7 +19520,7 @@ import fs5 from "fs";
 import path8 from "path";
 import { createRunWorkflowTool } from "@ai-setting/roy-agent-core/env/workflow/tools";
 import { getTracerProvider as getTracerProvider4, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
-import { isValidSessionId } from "@ai-setting/roy-agent-core/env/session/session-id";
+import { isValidSessionId } from "@ai-setting/roy-agent-core/env/session";
 var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   const output = new OutputService2;
   const envService = new EnvironmentService(output);

package/package.json

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