@ai-setting/roy-agent-cli 1.7.37 → 1.7.38

package/dist/bin/roy-agent.js

@@ -9461,7 +9461,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.37",
+  version: "1.7.38",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11527,6 +11527,12 @@ function extractChatId(event) {
   return;
 }
 
+// src/commands/shared/event-handler-wiring.ts
+import { existsSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/env/event-source/event-store";
+
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
 class EventHandler {
@@ -11543,6 +11549,8 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  eventStore = null;
+  getHandlerForEsType = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -11552,6 +11560,8 @@ class EventHandler {
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
     this.sessionComponent = options.sessionComponent ?? null;
+    this.eventStore = options.eventStore ?? null;
+    this.getHandlerForEsType = options.getHandlerForEsType ?? null;
   }
   start() {
     this.isStopped = false;
@@ -11589,13 +11599,94 @@ class EventHandler {
     this.isProcessing = false;
     this.clearActiveSession();
   }
-  handleEvent(event) {
+  async handleEvent(event) {
     if (this.isStopped) {
       return;
     }
-    const formatted = this.formatter.formatWithEvent(event);
+    const formatted = await this.formatEvent(event);
     this.enqueue(formatted);
   }
+  async formatEvent(event) {
+    if (event.type.startsWith("task.background.") && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
+      try {
+        const v2Formatted = await this.formatEventViaESPluginV2(event);
+        if (v2Formatted) {
+          return v2Formatted;
+        }
+      } catch (err) {
+        console.error(`[EventHandler] ESPlugin v2 path failed, falling back to formatter`, err);
+      }
+    }
+    return this.formatter.formatWithEvent(event);
+  }
+  async formatEventViaESPluginV2(event) {
+    const triggerEventId = event.metadata.triggerEventId;
+    const triggerEvent = await this.eventStore.getEventById(triggerEventId);
+    if (!triggerEvent) {
+      return null;
+    }
+    const handler = this.getHandlerForEsType(triggerEvent.esType);
+    if (!handler || !handler.buildNotifyHandlePrompt) {
+      return null;
+    }
+    const payload = event.payload;
+    const subAgentResult = {
+      summary: typeof payload?.result === "string" ? payload.result : typeof payload?.error === "string" ? payload.error : "(无结果)"
+    };
+    const profile = triggerEvent.metadata?.profile ?? undefined;
+    const prompt = handler.buildNotifyHandlePrompt({
+      notifyEvent: {
+        type: event.type,
+        taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
+        description: typeof payload?.description === "string" ? payload.description : undefined,
+        result: typeof payload?.result === "string" ? payload.result : undefined,
+        error: typeof payload?.error === "string" ? payload.error : undefined
+      },
+      triggerEvent,
+      subAgentResult,
+      profile
+    });
+    if (handler.postProcessNotifyEvent) {
+      const notifyEventForHook = {
+        type: event.type,
+        taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
+        description: typeof payload?.description === "string" ? payload.description : undefined,
+        result: typeof payload?.result === "string" ? payload.result : undefined,
+        error: typeof payload?.error === "string" ? payload.error : undefined
+      };
+      setTimeout(() => {
+        Promise.resolve(handler.postProcessNotifyEvent({
+          notifyEvent: notifyEventForHook,
+          triggerEvent,
+          subAgentResult,
+          formattedPrompt: prompt.promptText,
+          profile
+        })).catch((err) => {
+          console.error(`[EventHandler] postProcessNotifyEvent hook failed (swallowed)`, err);
+        });
+      }, 0);
+    }
+    const triggerChatId = triggerEvent.metadata?.chatId ?? undefined;
+    const triggerMessageId = triggerEvent.metadata?.messageId ?? undefined;
+    const triggerSessionId = event?.metadata?.trigger_session_id;
+    return {
+      message: prompt.promptText,
+      envEvent: event,
+      triggerSessionId,
+      chatId: triggerChatId,
+      ...triggerMessageId ? { triggerMessageId } : {}
+    };
+  }
+  async handleNotifyEventForTest(event) {
+    if (this.isStopped)
+      return;
+    const formatted = await this.formatEvent(event);
+    if (this.onEventWithEnv) {
+      await this.onEventWithEnv(formatted);
+    } else {
+      await this.onEvent(formatted.message);
+    }
+  }
   enqueue(formattedEvent) {
     if (this.isStopped) {
       return;
@@ -11771,13 +11862,29 @@ class EventHandler {
   }
 }
 __legacyDecorateClassTS([
-  TracedAs5("cli.event-handler.handleEvent", { recordParams: true }),
+  TracedAs5("event_handler.handle_event", { recordParams: true }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
     typeof EnvEvent === "undefined" ? Object : EnvEvent
   ]),
-  __legacyMetadataTS("design:returntype", undefined)
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.formatEvent", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "formatEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("event_handler.process_notify", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "formatEventViaESPluginV2", null);
 __legacyDecorateClassTS([
   TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
   __legacyMetadataTS("design:type", Function),
@@ -11795,6 +11902,62 @@ __legacyDecorateClassTS([
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "ensureChatSession", null);
 
+// src/commands/shared/event-handler-wiring.ts
+var storeCache = new Map;
+function getOrCreateEventStore(dbPath) {
+  const normalized = normalizeDbPath(dbPath);
+  let store = storeCache.get(normalized);
+  if (store)
+    return store;
+  ensureParentDir(normalized);
+  store = new EventStoreImpl({ dbPath: normalized });
+  storeCache.set(normalized, store);
+  setSharedEventStore(store);
+  return store;
+}
+function normalizeDbPath(dbPath) {
+  const expanded = dbPath.startsWith("~") ? join(homedir(), dbPath.slice(1).replace(/^\//, "")) : dbPath;
+  return expanded;
+}
+function ensureParentDir(dbPath) {
+  const parent = join(dbPath, "..");
+  if (!existsSync(parent)) {
+    mkdirSync(parent, { recursive: true });
+  }
+}
+function getHandlerForEsTypeForEnv(env) {
+  let component = null;
+  try {
+    component = env.getComponent?.("event-source") ?? null;
+  } catch {
+    component = null;
+  }
+  const hasGetHandler = component !== null && component !== undefined && typeof component.getHandler === "function";
+  return (esType) => {
+    if (!hasGetHandler)
+      return;
+    try {
+      const h = component.getHandler(esType);
+      return h ?? undefined;
+    } catch {
+      return;
+    }
+  };
+}
+function createDefaultEventStoreDbPath() {
+  return join(homedir(), ".roy-agent", "event-store.db");
+}
+function createEventHandlerForInteractive(options) {
+  const dbPath = options.dbPath ?? createDefaultEventStoreDbPath();
+  const eventStore = getOrCreateEventStore(dbPath);
+  const getHandlerForEsType = getHandlerForEsTypeForEnv(options.env);
+  return new EventHandler({
+    ...options,
+    eventStore,
+    getHandlerForEsType
+  });
+}
+
 // src/commands/shared/esc-active-descendant.ts
 function hasActiveDescendants(env, parentSessionId) {
   if (!env || !parentSessionId)
@@ -13646,12 +13809,13 @@ function createInteractiveCommand(externalEnvService) {
             console
           });
         });
-        const eventHandler = new EventHandler({
+        const eventHandler = createEventHandlerForInteractive({
           env,
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
           sessionComponent,
+          onEvent: async (_message) => {},
           onEventWithEnv: async (formattedEvent) => {
             await repl.handleEventMessageWithEnv(formattedEvent);
           }
@@ -14510,7 +14674,7 @@ async function loadHandleQuery(options, hooks) {
     env,
     enabled: true
   });
-  const eventHandler = new EventHandler({
+  const eventHandler = createEventHandlerForInteractive({
     env,
     eventTypes: ["task.background.*", "event-source.event.*"],
     formatter: new EventMessageFormatter({ prefix: "[通知]" }),
@@ -14646,7 +14810,7 @@ function createRunCommand() {
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
       const runState = {
         isIdle: () => true,
-        onNotification: () => {}
+        onNotification: async () => {}
       };
       const {
         handleQuery,
@@ -21450,15 +21614,15 @@ function resolveServerUrl(serverUrl, fallback) {
 }
 
 // src/lib/bounty-profile-reader.ts
-import { existsSync as existsSync2, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { existsSync as existsSync3, readFileSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join2 } from "node:path";
 function readBountyProfile(name, profilesDir) {
   if (!name)
     return null;
-  const dir = profilesDir ?? join(homedir(), ".config", "bounty", "profiles");
-  const profilePath = join(dir, `${name}.json`);
-  if (!existsSync2(profilePath))
+  const dir = profilesDir ?? join2(homedir2(), ".config", "bounty", "profiles");
+  const profilePath = join2(dir, `${name}.json`);
+  if (!existsSync3(profilePath))
     return null;
   try {
     const raw = readFileSync(profilePath, "utf-8");
@@ -25875,19 +26039,19 @@ var LspCommand = {
 
 // src/commands/install/index.ts
 import { spawnSync } from "node:child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync, mkdirSync, rmSync as rmSync2 } from "node:fs";
-import { join as join6, resolve } from "node:path";
-import { homedir as homedir4 } from "node:os";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync, mkdirSync as mkdirSync2, rmSync as rmSync2 } from "node:fs";
+import { join as join7, resolve } from "node:path";
+import { homedir as homedir5 } from "node:os";
 
 // src/commands/install/cleanup-stale-plugin-copies.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3, rmSync, cpSync } from "node:fs";
-import { join as join5 } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync3, rmSync, cpSync } from "node:fs";
+import { join as join6 } from "node:path";
 import { homedir as nodeHomedir, tmpdir as nodeTmpdir } from "node:os";
 function cleanupStalePluginCopies(packageName, options) {
   const HOME = options.homedir ?? nodeHomedir();
   const paths = options.localNodeModulesPaths ?? [
-    join5(HOME, "node_modules"),
-    join5(HOME, ".roy-agent", "node_modules")
+    join6(HOME, "node_modules"),
+    join6(HOME, ".roy-agent", "node_modules")
   ];
   const backupRoot = options.backupDir ?? nodeTmpdir();
   const result = {
@@ -25897,15 +26061,15 @@ function cleanupStalePluginCopies(packageName, options) {
   };
   if (!options.globalVersion) {
     for (const p of paths) {
-      const candidate = join5(p, packageName);
+      const candidate = join6(p, packageName);
       result.skipped.push({ path: candidate, reason: "no-global-version" });
     }
     return result;
   }
   for (const nmPath of paths) {
-    const localPkgDir = join5(nmPath, packageName);
-    const localPkgJson = join5(localPkgDir, "package.json");
-    if (!existsSync4(localPkgJson)) {
+    const localPkgDir = join6(nmPath, packageName);
+    const localPkgJson = join6(localPkgDir, "package.json");
+    if (!existsSync5(localPkgJson)) {
       result.skipped.push({ path: localPkgDir, reason: "no-local-copy" });
       continue;
     }
@@ -25926,7 +26090,7 @@ function cleanupStalePluginCopies(packageName, options) {
       const safeName = packageName.replace(/@/g, "").replace(/[^a-zA-Z0-9._/-]/g, "-");
       const safeLocalVersion = (localVersion ?? "unknown").replace(/[^a-zA-Z0-9._-]/g, "-");
       const timestamp = Date.now();
-      backupPath = join5(backupRoot, `${safeName}-${safeLocalVersion}-backup-${timestamp}`);
+      backupPath = join6(backupRoot, `${safeName}-${safeLocalVersion}-backup-${timestamp}`);
       cpSync(localPkgDir, backupPath, { recursive: true });
       result.backups.push({ originalPath: localPkgDir, backupPath });
     } catch (err) {
@@ -25961,19 +26125,19 @@ function compareVersions(a, b) {
 
 // src/commands/install/index.ts
 function getConfigDir(scope) {
-  return scope === "global" ? join6(homedir4(), ".roy-agent") : join6(process.cwd(), ".roy");
+  return scope === "global" ? join7(homedir5(), ".roy-agent") : join7(process.cwd(), ".roy");
 }
 function detectDefaultScope() {
-  const projectDir = join6(process.cwd(), ".roy");
-  return existsSync5(projectDir) ? "project" : "global";
+  const projectDir = join7(process.cwd(), ".roy");
+  return existsSync6(projectDir) ? "project" : "global";
 }
 function getConfigPath(scope) {
-  return join6(getConfigDir(scope), "plugins.json");
+  return join7(getConfigDir(scope), "plugins.json");
 }
 function loadPlugins(scope) {
   const configPath = getConfigPath(scope);
   try {
-    if (existsSync5(configPath)) {
+    if (existsSync6(configPath)) {
       const raw = readFileSync4(configPath, "utf-8");
       const config = JSON.parse(raw);
       return config.plugins ?? [];
@@ -25984,8 +26148,8 @@ function loadPlugins(scope) {
 function savePlugins(plugins, scope) {
   const configDir = getConfigDir(scope);
   const configPath = getConfigPath(scope);
-  if (!existsSync5(configDir)) {
-    mkdirSync(configDir, { recursive: true });
+  if (!existsSync6(configDir)) {
+    mkdirSync2(configDir, { recursive: true });
   }
   const config = { plugins };
   writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
@@ -26000,8 +26164,8 @@ function stripVersionSpec(packageName) {
 function readPackageInfo(packageName) {
   const bareName = packageName.startsWith("/") || packageName.startsWith(".") ? packageName : stripVersionSpec(packageName);
   if (packageName.startsWith("/") || packageName.startsWith(".")) {
-    const localPkgPath = join6(packageName, "package.json");
-    if (existsSync5(localPkgPath)) {
+    const localPkgPath = join7(packageName, "package.json");
+    if (existsSync6(localPkgPath)) {
       try {
         const pkg = JSON.parse(readFileSync4(localPkgPath, "utf-8"));
         return {
@@ -26015,18 +26179,18 @@ function readPackageInfo(packageName) {
     }
   }
   const searchPaths = [
-    join6(process.cwd(), "node_modules", bareName, "package.json"),
+    join7(process.cwd(), "node_modules", bareName, "package.json"),
     resolve(process.cwd(), "..", "node_modules", bareName, "package.json"),
-    join6(process.cwd(), ".roy", "plugins", bareName, "package.json"),
+    join7(process.cwd(), ".roy", "plugins", bareName, "package.json"),
     ...(() => {
       const globalRoot = getNpmGlobalRoot();
-      return globalRoot ? [join6(globalRoot, bareName, "package.json")] : [];
+      return globalRoot ? [join7(globalRoot, bareName, "package.json")] : [];
     })(),
-    join6(homedir4(), ".roy-agent", "node_modules", bareName, "package.json")
+    join7(homedir5(), ".roy-agent", "node_modules", bareName, "package.json")
   ];
   for (const pkgPath of searchPaths) {
     try {
-      if (existsSync5(pkgPath)) {
+      if (existsSync6(pkgPath)) {
         const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
         return {
           version: pkg.version ?? "0.0.0",
@@ -26060,15 +26224,15 @@ async function verifyInstalledVersion(packageName, declaredVersion) {
   return { ok: true, actualVersion: actual.version };
 }
 function getPackageManagerCommand() {
-  if (existsSync5(join6(process.cwd(), "pnpm-lock.yaml"))) {
-    if (existsSync5(join6(process.cwd(), "pnpm-workspace.yaml"))) {
+  if (existsSync6(join7(process.cwd(), "pnpm-lock.yaml"))) {
+    if (existsSync6(join7(process.cwd(), "pnpm-workspace.yaml"))) {
       return "pnpm -w";
     }
     return "pnpm";
   }
-  if (existsSync5(join6(process.cwd(), "yarn.lock")))
+  if (existsSync6(join7(process.cwd(), "yarn.lock")))
     return "yarn";
-  if (existsSync5(join6(process.cwd(), "bun.lock")) || existsSync5(join6(process.cwd(), "bun.lockb")))
+  if (existsSync6(join7(process.cwd(), "bun.lock")) || existsSync6(join7(process.cwd(), "bun.lockb")))
     return "bun";
   return "npm";
 }
@@ -26107,15 +26271,15 @@ var InstallPackageCommand = {
         }
         resolvedName = info2.name;
         const srcDir = resolve(packageName);
-        if (!existsSync5(srcDir)) {
+        if (!existsSync6(srcDir)) {
           console.error(`
 ❌ Local path '${srcDir}' does not exist.
 `);
           process.exit(1);
         }
-        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync5(pluginDir)) {
-          mkdirSync(pluginDir, { recursive: true });
+        const pluginDir = join7(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync6(pluginDir)) {
+          mkdirSync2(pluginDir, { recursive: true });
         }
         const result = spawnSync("cp", ["-r", `${srcDir}/.`, pluginDir], {
           stdio: "inherit",
@@ -26149,12 +26313,12 @@ var InstallPackageCommand = {
           process.exit(1);
         }
         resolvedName = info2.name;
-        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync5(pluginDir)) {
-          mkdirSync(pluginDir, { recursive: true });
+        const pluginDir = join7(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync6(pluginDir)) {
+          mkdirSync2(pluginDir, { recursive: true });
         }
-        const nmPath = join6(process.cwd(), "node_modules", packageName);
-        if (existsSync5(nmPath)) {
+        const nmPath = join7(process.cwd(), "node_modules", packageName);
+        if (existsSync6(nmPath)) {
           spawnSync("cp", ["-r", `${nmPath}/.`, pluginDir], { stdio: "inherit", shell: false });
         }
       }
@@ -26176,7 +26340,7 @@ var InstallPackageCommand = {
       if (tmpInfo) {
         const cleanupResult = cleanupStalePluginCopies(tmpInfo.name, {
           globalVersion: tmpInfo.version,
-          homedir: homedir4()
+          homedir: homedir5()
         });
         if (cleanupResult.cleaned.length > 0) {
           console.log(`
@@ -26316,8 +26480,8 @@ var InstallRemoveCommand = {
 \uD83D\uDDD1️  Removing plugin: ${plugin.packageName}@${plugin.version} (${scope})
 `);
     if (scope === "project") {
-      const pluginDir = join6(process.cwd(), ".roy", "plugins", plugin.packageName);
-      if (existsSync5(pluginDir)) {
+      const pluginDir = join7(process.cwd(), ".roy", "plugins", plugin.packageName);
+      if (existsSync6(pluginDir)) {
         spawnSync("rm", ["-rf", pluginDir], { stdio: "inherit", shell: false });
         console.log(`  Removed plugin directory: ${pluginDir}`);
       }
@@ -26332,8 +26496,8 @@ var InstallRemoveCommand = {
 `);
         process.exit(result.status ?? 1);
       }
-      const globalNm = join6(homedir4(), ".roy-agent", "node_modules", plugin.packageName);
-      if (existsSync5(globalNm)) {
+      const globalNm = join7(homedir5(), ".roy-agent", "node_modules", plugin.packageName);
+      if (existsSync6(globalNm)) {
         spawnSync("rm", ["-rf", globalNm], { stdio: "inherit", shell: false });
       }
     }

package/dist/index.js

@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.37",
+  version: "1.7.38",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11526,6 +11526,12 @@ function extractChatId(event) {
   return;
 }
 
+// src/commands/shared/event-handler-wiring.ts
+import { existsSync, mkdirSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+import { EventStoreImpl, setSharedEventStore } from "@ai-setting/roy-agent-core/env/event-source/event-store";
+
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
 class EventHandler {
@@ -11542,6 +11548,8 @@ class EventHandler {
   unsubscribe = null;
   sessionComponent = null;
   activeEventSessionId = null;
+  eventStore = null;
+  getHandlerForEsType = null;
   constructor(options) {
     this.env = options.env;
     this.eventTypes = options.eventTypes;
@@ -11551,6 +11559,8 @@ class EventHandler {
     this.isIdle = options.isIdle ?? (() => true);
     this.idleCheckInterval = options.idleCheckInterval ?? 100;
     this.sessionComponent = options.sessionComponent ?? null;
+    this.eventStore = options.eventStore ?? null;
+    this.getHandlerForEsType = options.getHandlerForEsType ?? null;
   }
   start() {
     this.isStopped = false;
@@ -11588,13 +11598,94 @@ class EventHandler {
     this.isProcessing = false;
     this.clearActiveSession();
   }
-  handleEvent(event) {
+  async handleEvent(event) {
     if (this.isStopped) {
       return;
     }
-    const formatted = this.formatter.formatWithEvent(event);
+    const formatted = await this.formatEvent(event);
     this.enqueue(formatted);
   }
+  async formatEvent(event) {
+    if (event.type.startsWith("task.background.") && event.metadata?.triggerEventId && this.eventStore && this.getHandlerForEsType) {
+      try {
+        const v2Formatted = await this.formatEventViaESPluginV2(event);
+        if (v2Formatted) {
+          return v2Formatted;
+        }
+      } catch (err) {
+        console.error(`[EventHandler] ESPlugin v2 path failed, falling back to formatter`, err);
+      }
+    }
+    return this.formatter.formatWithEvent(event);
+  }
+  async formatEventViaESPluginV2(event) {
+    const triggerEventId = event.metadata.triggerEventId;
+    const triggerEvent = await this.eventStore.getEventById(triggerEventId);
+    if (!triggerEvent) {
+      return null;
+    }
+    const handler = this.getHandlerForEsType(triggerEvent.esType);
+    if (!handler || !handler.buildNotifyHandlePrompt) {
+      return null;
+    }
+    const payload = event.payload;
+    const subAgentResult = {
+      summary: typeof payload?.result === "string" ? payload.result : typeof payload?.error === "string" ? payload.error : "(无结果)"
+    };
+    const profile = triggerEvent.metadata?.profile ?? undefined;
+    const prompt = handler.buildNotifyHandlePrompt({
+      notifyEvent: {
+        type: event.type,
+        taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
+        description: typeof payload?.description === "string" ? payload.description : undefined,
+        result: typeof payload?.result === "string" ? payload.result : undefined,
+        error: typeof payload?.error === "string" ? payload.error : undefined
+      },
+      triggerEvent,
+      subAgentResult,
+      profile
+    });
+    if (handler.postProcessNotifyEvent) {
+      const notifyEventForHook = {
+        type: event.type,
+        taskId: typeof payload?.associatedTaskId === "number" ? payload.associatedTaskId : undefined,
+        description: typeof payload?.description === "string" ? payload.description : undefined,
+        result: typeof payload?.result === "string" ? payload.result : undefined,
+        error: typeof payload?.error === "string" ? payload.error : undefined
+      };
+      setTimeout(() => {
+        Promise.resolve(handler.postProcessNotifyEvent({
+          notifyEvent: notifyEventForHook,
+          triggerEvent,
+          subAgentResult,
+          formattedPrompt: prompt.promptText,
+          profile
+        })).catch((err) => {
+          console.error(`[EventHandler] postProcessNotifyEvent hook failed (swallowed)`, err);
+        });
+      }, 0);
+    }
+    const triggerChatId = triggerEvent.metadata?.chatId ?? undefined;
+    const triggerMessageId = triggerEvent.metadata?.messageId ?? undefined;
+    const triggerSessionId = event?.metadata?.trigger_session_id;
+    return {
+      message: prompt.promptText,
+      envEvent: event,
+      triggerSessionId,
+      chatId: triggerChatId,
+      ...triggerMessageId ? { triggerMessageId } : {}
+    };
+  }
+  async handleNotifyEventForTest(event) {
+    if (this.isStopped)
+      return;
+    const formatted = await this.formatEvent(event);
+    if (this.onEventWithEnv) {
+      await this.onEventWithEnv(formatted);
+    } else {
+      await this.onEvent(formatted.message);
+    }
+  }
   enqueue(formattedEvent) {
     if (this.isStopped) {
       return;
@@ -11770,13 +11861,29 @@ class EventHandler {
   }
 }
 __legacyDecorateClassTS([
-  TracedAs5("cli.event-handler.handleEvent", { recordParams: true }),
+  TracedAs5("event_handler.handle_event", { recordParams: true }),
   __legacyMetadataTS("design:type", Function),
   __legacyMetadataTS("design:paramtypes", [
     typeof EnvEvent === "undefined" ? Object : EnvEvent
   ]),
-  __legacyMetadataTS("design:returntype", undefined)
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "handleEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("cli.event-handler.formatEvent", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "formatEvent", null);
+__legacyDecorateClassTS([
+  TracedAs5("event_handler.process_notify", { recordParams: true, recordResult: false }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], EventHandler.prototype, "formatEventViaESPluginV2", null);
 __legacyDecorateClassTS([
   TracedAs5("cli.event-handler.ensureActiveSession", { recordParams: true }),
   __legacyMetadataTS("design:type", Function),
@@ -11794,6 +11901,62 @@ __legacyDecorateClassTS([
   __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
 ], EventHandler.prototype, "ensureChatSession", null);
 
+// src/commands/shared/event-handler-wiring.ts
+var storeCache = new Map;
+function getOrCreateEventStore(dbPath) {
+  const normalized = normalizeDbPath(dbPath);
+  let store = storeCache.get(normalized);
+  if (store)
+    return store;
+  ensureParentDir(normalized);
+  store = new EventStoreImpl({ dbPath: normalized });
+  storeCache.set(normalized, store);
+  setSharedEventStore(store);
+  return store;
+}
+function normalizeDbPath(dbPath) {
+  const expanded = dbPath.startsWith("~") ? join(homedir(), dbPath.slice(1).replace(/^\//, "")) : dbPath;
+  return expanded;
+}
+function ensureParentDir(dbPath) {
+  const parent = join(dbPath, "..");
+  if (!existsSync(parent)) {
+    mkdirSync(parent, { recursive: true });
+  }
+}
+function getHandlerForEsTypeForEnv(env) {
+  let component = null;
+  try {
+    component = env.getComponent?.("event-source") ?? null;
+  } catch {
+    component = null;
+  }
+  const hasGetHandler = component !== null && component !== undefined && typeof component.getHandler === "function";
+  return (esType) => {
+    if (!hasGetHandler)
+      return;
+    try {
+      const h = component.getHandler(esType);
+      return h ?? undefined;
+    } catch {
+      return;
+    }
+  };
+}
+function createDefaultEventStoreDbPath() {
+  return join(homedir(), ".roy-agent", "event-store.db");
+}
+function createEventHandlerForInteractive(options) {
+  const dbPath = options.dbPath ?? createDefaultEventStoreDbPath();
+  const eventStore = getOrCreateEventStore(dbPath);
+  const getHandlerForEsType = getHandlerForEsTypeForEnv(options.env);
+  return new EventHandler({
+    ...options,
+    eventStore,
+    getHandlerForEsType
+  });
+}
+
 // src/commands/shared/esc-active-descendant.ts
 function hasActiveDescendants(env, parentSessionId) {
   if (!env || !parentSessionId)
@@ -13645,12 +13808,13 @@ function createInteractiveCommand(externalEnvService) {
             console
           });
         });
-        const eventHandler = new EventHandler({
+        const eventHandler = createEventHandlerForInteractive({
           env,
           eventTypes: ["task.background.*", "event-source.event.*"],
           formatter: new EventMessageFormatter({ prefix: "[通知]" }),
           isIdle: () => repl.isIdle(),
           sessionComponent,
+          onEvent: async (_message) => {},
           onEventWithEnv: async (formattedEvent) => {
             await repl.handleEventMessageWithEnv(formattedEvent);
           }
@@ -14509,7 +14673,7 @@ async function loadHandleQuery(options, hooks) {
     env,
     enabled: true
   });
-  const eventHandler = new EventHandler({
+  const eventHandler = createEventHandlerForInteractive({
     env,
     eventTypes: ["task.background.*", "event-source.event.*"],
     formatter: new EventMessageFormatter({ prefix: "[通知]" }),
@@ -14645,7 +14809,7 @@ function createRunCommand() {
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
       const runState = {
         isIdle: () => true,
-        onNotification: () => {}
+        onNotification: async () => {}
       };
       const {
         handleQuery,
@@ -21449,15 +21613,15 @@ function resolveServerUrl(serverUrl, fallback) {
 }
 
 // src/lib/bounty-profile-reader.ts
-import { existsSync as existsSync2, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { existsSync as existsSync3, readFileSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join2 } from "node:path";
 function readBountyProfile(name, profilesDir) {
   if (!name)
     return null;
-  const dir = profilesDir ?? join(homedir(), ".config", "bounty", "profiles");
-  const profilePath = join(dir, `${name}.json`);
-  if (!existsSync2(profilePath))
+  const dir = profilesDir ?? join2(homedir2(), ".config", "bounty", "profiles");
+  const profilePath = join2(dir, `${name}.json`);
+  if (!existsSync3(profilePath))
     return null;
   try {
     const raw = readFileSync(profilePath, "utf-8");
@@ -25874,19 +26038,19 @@ var LspCommand = {
 
 // src/commands/install/index.ts
 import { spawnSync } from "node:child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync, mkdirSync, rmSync as rmSync2 } from "node:fs";
-import { join as join6, resolve } from "node:path";
-import { homedir as homedir4 } from "node:os";
+import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync, mkdirSync as mkdirSync2, rmSync as rmSync2 } from "node:fs";
+import { join as join7, resolve } from "node:path";
+import { homedir as homedir5 } from "node:os";
 
 // src/commands/install/cleanup-stale-plugin-copies.ts
-import { existsSync as existsSync4, readFileSync as readFileSync3, rmSync, cpSync } from "node:fs";
-import { join as join5 } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync3, rmSync, cpSync } from "node:fs";
+import { join as join6 } from "node:path";
 import { homedir as nodeHomedir, tmpdir as nodeTmpdir } from "node:os";
 function cleanupStalePluginCopies(packageName, options) {
   const HOME = options.homedir ?? nodeHomedir();
   const paths = options.localNodeModulesPaths ?? [
-    join5(HOME, "node_modules"),
-    join5(HOME, ".roy-agent", "node_modules")
+    join6(HOME, "node_modules"),
+    join6(HOME, ".roy-agent", "node_modules")
   ];
   const backupRoot = options.backupDir ?? nodeTmpdir();
   const result = {
@@ -25896,15 +26060,15 @@ function cleanupStalePluginCopies(packageName, options) {
   };
   if (!options.globalVersion) {
     for (const p of paths) {
-      const candidate = join5(p, packageName);
+      const candidate = join6(p, packageName);
       result.skipped.push({ path: candidate, reason: "no-global-version" });
     }
     return result;
   }
   for (const nmPath of paths) {
-    const localPkgDir = join5(nmPath, packageName);
-    const localPkgJson = join5(localPkgDir, "package.json");
-    if (!existsSync4(localPkgJson)) {
+    const localPkgDir = join6(nmPath, packageName);
+    const localPkgJson = join6(localPkgDir, "package.json");
+    if (!existsSync5(localPkgJson)) {
       result.skipped.push({ path: localPkgDir, reason: "no-local-copy" });
       continue;
     }
@@ -25925,7 +26089,7 @@ function cleanupStalePluginCopies(packageName, options) {
       const safeName = packageName.replace(/@/g, "").replace(/[^a-zA-Z0-9._/-]/g, "-");
       const safeLocalVersion = (localVersion ?? "unknown").replace(/[^a-zA-Z0-9._-]/g, "-");
       const timestamp = Date.now();
-      backupPath = join5(backupRoot, `${safeName}-${safeLocalVersion}-backup-${timestamp}`);
+      backupPath = join6(backupRoot, `${safeName}-${safeLocalVersion}-backup-${timestamp}`);
       cpSync(localPkgDir, backupPath, { recursive: true });
       result.backups.push({ originalPath: localPkgDir, backupPath });
     } catch (err) {
@@ -25960,19 +26124,19 @@ function compareVersions(a, b) {
 
 // src/commands/install/index.ts
 function getConfigDir(scope) {
-  return scope === "global" ? join6(homedir4(), ".roy-agent") : join6(process.cwd(), ".roy");
+  return scope === "global" ? join7(homedir5(), ".roy-agent") : join7(process.cwd(), ".roy");
 }
 function detectDefaultScope() {
-  const projectDir = join6(process.cwd(), ".roy");
-  return existsSync5(projectDir) ? "project" : "global";
+  const projectDir = join7(process.cwd(), ".roy");
+  return existsSync6(projectDir) ? "project" : "global";
 }
 function getConfigPath(scope) {
-  return join6(getConfigDir(scope), "plugins.json");
+  return join7(getConfigDir(scope), "plugins.json");
 }
 function loadPlugins(scope) {
   const configPath = getConfigPath(scope);
   try {
-    if (existsSync5(configPath)) {
+    if (existsSync6(configPath)) {
       const raw = readFileSync4(configPath, "utf-8");
       const config = JSON.parse(raw);
       return config.plugins ?? [];
@@ -25983,8 +26147,8 @@ function loadPlugins(scope) {
 function savePlugins(plugins, scope) {
   const configDir = getConfigDir(scope);
   const configPath = getConfigPath(scope);
-  if (!existsSync5(configDir)) {
-    mkdirSync(configDir, { recursive: true });
+  if (!existsSync6(configDir)) {
+    mkdirSync2(configDir, { recursive: true });
   }
   const config = { plugins };
   writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
@@ -25999,8 +26163,8 @@ function stripVersionSpec(packageName) {
 function readPackageInfo(packageName) {
   const bareName = packageName.startsWith("/") || packageName.startsWith(".") ? packageName : stripVersionSpec(packageName);
   if (packageName.startsWith("/") || packageName.startsWith(".")) {
-    const localPkgPath = join6(packageName, "package.json");
-    if (existsSync5(localPkgPath)) {
+    const localPkgPath = join7(packageName, "package.json");
+    if (existsSync6(localPkgPath)) {
       try {
         const pkg = JSON.parse(readFileSync4(localPkgPath, "utf-8"));
         return {
@@ -26014,18 +26178,18 @@ function readPackageInfo(packageName) {
     }
   }
   const searchPaths = [
-    join6(process.cwd(), "node_modules", bareName, "package.json"),
+    join7(process.cwd(), "node_modules", bareName, "package.json"),
     resolve(process.cwd(), "..", "node_modules", bareName, "package.json"),
-    join6(process.cwd(), ".roy", "plugins", bareName, "package.json"),
+    join7(process.cwd(), ".roy", "plugins", bareName, "package.json"),
     ...(() => {
       const globalRoot = getNpmGlobalRoot();
-      return globalRoot ? [join6(globalRoot, bareName, "package.json")] : [];
+      return globalRoot ? [join7(globalRoot, bareName, "package.json")] : [];
     })(),
-    join6(homedir4(), ".roy-agent", "node_modules", bareName, "package.json")
+    join7(homedir5(), ".roy-agent", "node_modules", bareName, "package.json")
   ];
   for (const pkgPath of searchPaths) {
     try {
-      if (existsSync5(pkgPath)) {
+      if (existsSync6(pkgPath)) {
         const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
         return {
           version: pkg.version ?? "0.0.0",
@@ -26059,15 +26223,15 @@ async function verifyInstalledVersion(packageName, declaredVersion) {
   return { ok: true, actualVersion: actual.version };
 }
 function getPackageManagerCommand() {
-  if (existsSync5(join6(process.cwd(), "pnpm-lock.yaml"))) {
-    if (existsSync5(join6(process.cwd(), "pnpm-workspace.yaml"))) {
+  if (existsSync6(join7(process.cwd(), "pnpm-lock.yaml"))) {
+    if (existsSync6(join7(process.cwd(), "pnpm-workspace.yaml"))) {
       return "pnpm -w";
     }
     return "pnpm";
   }
-  if (existsSync5(join6(process.cwd(), "yarn.lock")))
+  if (existsSync6(join7(process.cwd(), "yarn.lock")))
     return "yarn";
-  if (existsSync5(join6(process.cwd(), "bun.lock")) || existsSync5(join6(process.cwd(), "bun.lockb")))
+  if (existsSync6(join7(process.cwd(), "bun.lock")) || existsSync6(join7(process.cwd(), "bun.lockb")))
     return "bun";
   return "npm";
 }
@@ -26106,15 +26270,15 @@ var InstallPackageCommand = {
         }
         resolvedName = info2.name;
         const srcDir = resolve(packageName);
-        if (!existsSync5(srcDir)) {
+        if (!existsSync6(srcDir)) {
           console.error(`
 ❌ Local path '${srcDir}' does not exist.
 `);
           process.exit(1);
         }
-        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync5(pluginDir)) {
-          mkdirSync(pluginDir, { recursive: true });
+        const pluginDir = join7(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync6(pluginDir)) {
+          mkdirSync2(pluginDir, { recursive: true });
         }
         const result = spawnSync("cp", ["-r", `${srcDir}/.`, pluginDir], {
           stdio: "inherit",
@@ -26148,12 +26312,12 @@ var InstallPackageCommand = {
           process.exit(1);
         }
         resolvedName = info2.name;
-        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync5(pluginDir)) {
-          mkdirSync(pluginDir, { recursive: true });
+        const pluginDir = join7(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync6(pluginDir)) {
+          mkdirSync2(pluginDir, { recursive: true });
         }
-        const nmPath = join6(process.cwd(), "node_modules", packageName);
-        if (existsSync5(nmPath)) {
+        const nmPath = join7(process.cwd(), "node_modules", packageName);
+        if (existsSync6(nmPath)) {
           spawnSync("cp", ["-r", `${nmPath}/.`, pluginDir], { stdio: "inherit", shell: false });
         }
       }
@@ -26175,7 +26339,7 @@ var InstallPackageCommand = {
       if (tmpInfo) {
         const cleanupResult = cleanupStalePluginCopies(tmpInfo.name, {
           globalVersion: tmpInfo.version,
-          homedir: homedir4()
+          homedir: homedir5()
         });
         if (cleanupResult.cleaned.length > 0) {
           console.log(`
@@ -26315,8 +26479,8 @@ var InstallRemoveCommand = {
 \uD83D\uDDD1️  Removing plugin: ${plugin.packageName}@${plugin.version} (${scope})
 `);
     if (scope === "project") {
-      const pluginDir = join6(process.cwd(), ".roy", "plugins", plugin.packageName);
-      if (existsSync5(pluginDir)) {
+      const pluginDir = join7(process.cwd(), ".roy", "plugins", plugin.packageName);
+      if (existsSync6(pluginDir)) {
         spawnSync("rm", ["-rf", pluginDir], { stdio: "inherit", shell: false });
         console.log(`  Removed plugin directory: ${pluginDir}`);
       }
@@ -26331,8 +26495,8 @@ var InstallRemoveCommand = {
 `);
         process.exit(result.status ?? 1);
       }
-      const globalNm = join6(homedir4(), ".roy-agent", "node_modules", plugin.packageName);
-      if (existsSync5(globalNm)) {
+      const globalNm = join7(homedir5(), ".roy-agent", "node_modules", plugin.packageName);
+      if (existsSync6(globalNm)) {
         spawnSync("rm", ["-rf", globalNm], { stdio: "inherit", shell: false });
       }
     }

package/dist/roy-agent-linux-x64/bin/roy-agent

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/roy-agent-linux-x64/bin/roy-agent
-size: 109578368 bytes
-sha256: ad7560c97b5e09248411d66d1355e7f4c0e9d6bfbbfdf7674bf6ca63635c4fe0
+size: 109602944 bytes
+sha256: 4bff7951c55594175f880f2caca477359a3c55c89b5b973d9ba7cf8e721d8928

package/package.json

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