@ai-setting/roy-agent-cli 1.5.38 → 1.5.40

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.38",
+    version: "1.5.40",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7246,8 +7246,8 @@ var require_package = __commonJS((exports, module) => {
       typecheck: "npx tsc --noEmit --skipLibCheck"
     },
     dependencies: {
-      "@ai-setting/roy-agent-coder-harness": "^1.5.36",
-      "@ai-setting/roy-agent-core": "^1.5.36",
+      "@ai-setting/roy-agent-coder-harness": "^1.5.40",
+      "@ai-setting/roy-agent-core": "^1.5.40",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -7337,7 +7337,8 @@ import {
   McpComponent,
   CommandsComponent,
   MemoryComponent,
-  EventSourceComponent
+  EventSourceComponent,
+  PluginComponent
 } from "@ai-setting/roy-agent-core";
 import { WorkflowComponent } from "@ai-setting/roy-agent-core";
 import { MemoryPlugin } from "@ai-setting/roy-agent-core";
@@ -7404,124 +7405,6 @@ class OutputService {
   }
 }
 
-// src/plugin/registry.ts
-var taskTagPlugin = {
-  info: {
-    name: "task-tag",
-    version: "1.0.0",
-    description: "Intelligent tag suggestion and similar task experience injection"
-  },
-  getComponentPlugins() {
-    return [{
-      name: "task-tag",
-      targetComponent: "task",
-      factory: async () => {
-        const { TaskTagPlugin } = await import("@ai-setting/roy-agent-core");
-        return new TaskTagPlugin;
-      }
-    }];
-  }
-};
-var BUILTIN_PLUGINS = [
-  taskTagPlugin
-];
-
-class PluginRegistry {
-  plugins = new Map;
-  constructor() {
-    for (const plugin of BUILTIN_PLUGINS) {
-      this.registerBuiltin(plugin);
-    }
-  }
-  register(plugin) {
-    if (this.plugins.has(plugin.info.name)) {
-      throw new Error(`Plugin "${plugin.info.name}" is already registered`);
-    }
-    this.plugins.set(plugin.info.name, plugin);
-  }
-  registerBuiltin(plugin) {
-    if (!this.plugins.has(plugin.info.name)) {
-      this.plugins.set(plugin.info.name, plugin);
-    }
-  }
-  unregister(name) {
-    this.plugins.delete(name);
-  }
-  get(name) {
-    return this.plugins.get(name);
-  }
-  has(name) {
-    return this.plugins.has(name);
-  }
-  getAll() {
-    return Array.from(this.plugins.values()).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
-  }
-  get size() {
-    return this.plugins.size;
-  }
-  getAllCommands() {
-    const commands = [];
-    for (const plugin of this.getAll()) {
-      commands.push(...plugin.getCommands?.() ?? []);
-    }
-    return commands;
-  }
-  getAllComponents() {
-    const components = [];
-    for (const plugin of this.getAll()) {
-      components.push(...plugin.getComponents?.() ?? []);
-    }
-    return components;
-  }
-  getAllComponentPlugins() {
-    const componentPlugins = [];
-    for (const plugin of this.getAll()) {
-      componentPlugins.push(...plugin.getComponentPlugins?.() ?? []);
-    }
-    return componentPlugins;
-  }
-  getComponentPlugin(name) {
-    for (const plugin of this.getAll()) {
-      const componentPlugins = plugin.getComponentPlugins?.() ?? [];
-      for (const cp of componentPlugins) {
-        if (cp.name === name) {
-          return cp;
-        }
-      }
-    }
-    return;
-  }
-  *getPluginComponents() {
-    for (const plugin of this.getAll()) {
-      for (const definition of plugin.getComponents?.() ?? []) {
-        yield { plugin, definition };
-      }
-    }
-  }
-  clear() {
-    for (const name of this.plugins.keys()) {
-      const plugin = this.plugins.get(name);
-      if (!BUILTIN_PLUGINS.some((p) => p.info.name === name)) {
-        this.plugins.delete(name);
-      }
-    }
-  }
-  async executeLifecycleHooks(phase, env) {
-    const hookName = phase === "beforeInit" ? "onBeforeInit" : "onAfterInit";
-    for (const plugin of this.getAll()) {
-      const hook = plugin[hookName];
-      if (hook) {
-        try {
-          await hook({ env });
-        } catch (err) {
-          console.warn(`[roy] Plugin "${plugin.info.name}" ${hookName} failed:`, err);
-        }
-      }
-    }
-  }
-}
-var globalPluginRegistry = new PluginRegistry;
-
 // src/services/environment.service.ts
 var logger = createLogger("environment-service");
 var CLI_CONFIG_DIR_NAME = "roy-agent";
@@ -7553,6 +7436,7 @@ class EnvironmentService {
   memoryPlugin;
   eventSourceComponent;
   workflowComponent;
+  pluginComponent;
   constructor(output) {
     this.output = output ?? new OutputService;
   }
@@ -7585,6 +7469,7 @@ class EnvironmentService {
   }
   async dispose() {
     for (const component of [
+      this.pluginComponent,
       this.eventSourceComponent,
       this.memoryComponent,
       this.commandsComponent,
@@ -7814,20 +7699,22 @@ class EnvironmentService {
     env.registerComponent(memoryComponent);
     env.registerComponent(eventSourceComponent);
     env.registerComponent(workflowComponent);
+    this.pluginComponent = new PluginComponent;
+    const pluginComponent = this.pluginComponent;
+    await pluginComponent.init({
+      env,
+      options: {
+        configComponent
+      }
+    });
+    env.registerComponent(pluginComponent);
     this.registerCommandsPromptHook(promptComponent, commandsComponent);
     await env.init();
     await env.start();
     agentComponent.refreshDependencies();
     logger.debug("[EnvironmentService] AgentComponent dependencies refreshed after env.start()");
     if (options?.plugins && options.plugins.length > 0) {
-      await this.loadComponentPlugins(options.plugins, {
-        task: taskComponent,
-        memory: memoryComponent,
-        llm: llmComponent
-      });
-    }
-    if (options?.plugins && options.plugins.length > 0) {
-      await this.loadCoderPlugins(options.plugins);
+      await this.loadPlugins(options.plugins);
     }
     this.environment = env;
     return env;
@@ -7854,27 +7741,54 @@ class EnvironmentService {
     });
     this.output.info("Registered commands-prompt Hook");
   }
-  async loadComponentPlugins(pluginNames, components) {
+  async loadPlugins(pluginNames) {
     for (const name of pluginNames) {
       try {
-        const definition = globalPluginRegistry.getComponentPlugin(name);
-        if (!definition) {
-          this.output.warn(`[EnvironmentService] Component plugin not found: ${name}`);
-          continue;
-        }
-        const plugin = await definition.factory();
-        const targetComponent = components[definition.targetComponent];
-        if (targetComponent && typeof targetComponent.registerPlugin === "function") {
-          targetComponent.registerPlugin(plugin);
-          const registeredPlugins = targetComponent.listPlugins?.() || [];
-          const isRegistered = registeredPlugins.some((p) => p.name === plugin.name);
-          this.output.log(`[EnvironmentService] Loaded component plugin: ${name} -> ${definition.targetComponent}`);
-          this.output.log(`[EnvironmentService] Plugin verified: ${isRegistered ? "YES" : "NO"} (${plugin.name} in ${definition.targetComponent})`);
-        } else {
-          this.output.warn(`[EnvironmentService] Target component not found or not registerable: ${definition.targetComponent}`);
+        let plugin;
+        switch (name) {
+          case "task-tag": {
+            const { TaskTagPlugin } = await import("@ai-setting/roy-agent-core");
+            plugin = new TaskTagPlugin;
+            break;
+          }
+          case "lsp": {
+            const { LSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new LSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "code-check": {
+            const { CodeCheckPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new CodeCheckPlugin;
+            break;
+          }
+          case "reminder": {
+            const { ReminderPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new ReminderPlugin;
+            break;
+          }
+          case "tslsp": {
+            const { TSLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new TSLSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "pylsp": {
+            const { PyLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new PyLSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "mdlsp": {
+            const { MDLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new MDLSPPlugin;
+            break;
+          }
+          default:
+            this.output.warn(`[EnvironmentService] Unknown plugin: ${name}`);
+            continue;
         }
+        this.pluginComponent?.register(plugin);
+        this.output.log(`[EnvironmentService] Registered plugin: ${name}`);
       } catch (error) {
-        this.output.error(`[EnvironmentService] Error loading component plugin "${name}": ${error}`);
+        this.output.error(`[EnvironmentService] Error loading plugin "${name}": ${error}`);
       }
     }
   }
@@ -7892,22 +7806,6 @@ ${rows}
 
 Progressive Discovery: Run \`<command> --help\` to explore full capabilities.`;
   }
-  async loadCoderPlugins(pluginNames) {
-    const { createPluginHookAdapter } = await import("@ai-setting/roy-agent-coder-harness");
-    const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-    const pluginConfigs = {
-      enableLSP: pluginNames.includes("lsp"),
-      enableCodeCheck: pluginNames.includes("code-check"),
-      enableReminder: pluginNames.includes("reminder")
-    };
-    if (!pluginConfigs.enableLSP && !pluginConfigs.enableCodeCheck && !pluginConfigs.enableReminder) {
-      return;
-    }
-    const hookManager = globalHookManager2;
-    const adapter = createPluginHookAdapter(hookManager, pluginConfigs);
-    await adapter.initialize();
-    this.output.log(`[EnvironmentService] Loaded coder plugins: ${pluginNames.join(", ")}`);
-  }
 }
 
 // src/commands/act.ts
@@ -8406,64 +8304,47 @@ function createActCommand(externalEnvService) {
         if (llmComponent && promptComponent) {
           sessionComponent.setSummaryComponents(promptComponent, llmComponent);
         }
-        if (coderPluginNames.length > 0) {
+        if (coderPluginNames.includes("lsp")) {
           try {
-            const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-            const { createPluginHookAdapter, createGlobalLSPManager } = await import("@ai-setting/roy-agent-coder-harness");
-            const adapter = createPluginHookAdapter(globalHookManager2, {
-              enableLSP: coderPluginNames.includes("lsp"),
-              enableCodeCheck: coderPluginNames.includes("code-check"),
-              enableReminder: coderPluginNames.includes("reminder"),
-              enableTSLSP: coderPluginNames.includes("tslsp"),
-              enablePylsp: coderPluginNames.includes("pylsp"),
-              enableMdlsp: coderPluginNames.includes("mdlsp")
-            });
-            await adapter.initialize();
-            pluginAdapterDispose = () => adapter.dispose();
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
             if (enabledPlugins.length > 0) {
               console.log(`已启用插件: ${enabledPlugins.join(", ")}`);
               output.success(`✅ 已启用插件: ${enabledPlugins.join(", ")}`);
-              if (coderPluginNames.includes("lsp") && !quiet) {
+              if (!quiet) {
                 output.info(`\uD83D\uDD27 LSP 服务预加载中，首次诊断可能需要等待...`);
               }
             }
-            if (coderPluginNames.includes("lsp")) {
-              try {
-                const { createLSPConfigLoader } = await import("@ai-setting/roy-agent-coder-harness");
-                const configLoader = createLSPConfigLoader();
-                const lspConfig = configLoader.load();
+            const { createLSPConfigLoader } = await import("@ai-setting/roy-agent-coder-harness");
+            const configLoader = createLSPConfigLoader();
+            const lspConfig = configLoader.load();
+            if (!quiet) {
+              output.info("正在预热 LSP 服务器...");
+              if (lspConfig.preload) {
+                output.info("\uD83D\uDCCB 使用配置文件中的预加载设置");
+              }
+            }
+            const { createGlobalLSPManager: createGlobalLSPManager2 } = await import("@ai-setting/roy-agent-coder-harness");
+            const lspManager = createGlobalLSPManager2({
+              idleTimeout: lspConfig.idleTimeout ?? 300000,
+              maxConnections: lspConfig.maxConnections ?? 10,
+              autoDownload: lspConfig.autoInstall ?? false,
+              preloadLanguages: lspConfig.preloadLanguages
+            });
+            lspManager.registerShutdownHandler();
+            lspManagerDispose = () => lspManager.dispose();
+            if (lspConfig.preload || coderPluginNames.includes("lsp")) {
+              lspManager.prewarm().then(() => {
                 if (!quiet) {
-                  output.info("正在预热 LSP 服务器...");
-                  if (lspConfig.preload) {
-                    output.info("\uD83D\uDCCB 使用配置文件中的预加载设置");
-                  }
+                  output.success("✅ LSP 服务器预热完成");
                 }
-                const lspManager = createGlobalLSPManager({
-                  idleTimeout: lspConfig.idleTimeout ?? 300000,
-                  maxConnections: lspConfig.maxConnections ?? 10,
-                  autoDownload: lspConfig.autoInstall ?? false,
-                  preloadLanguages: lspConfig.preloadLanguages
-                });
-                lspManager.registerShutdownHandler();
-                lspManagerDispose = () => lspManager.dispose();
-                if (lspConfig.preload || coderPluginNames.includes("lsp")) {
-                  lspManager.prewarm().then(() => {
-                    if (!quiet) {
-                      output.success("✅ LSP 服务器预热完成");
-                    }
-                  }).catch((err) => {
-                    if (!quiet) {
-                      output.warn(`⚠ LSP 预热部分失败: ${err.message}`);
-                    }
-                  });
+              }).catch((err) => {
+                if (!quiet) {
+                  output.warn(`⚠ LSP 预热部分失败: ${err.message}`);
                 }
-              } catch (error) {
-                output.warn(`⚠ LSP 预热失败: ${error}`);
-              }
+              });
             }
           } catch (error) {
-            output.error(`❌ 加载 coder-harness 插件失败: ${error}`);
+            output.warn(`⚠ LSP 预热失败: ${error}`);
           }
         }
         const streamService = new StreamOutputService({
@@ -8654,8 +8535,7 @@ class SessionManager {
 
 // src/commands/shared/query-executor.ts
 init_stream_output_service();
-import { ContextError as ContextError3, ErrorCodes as ErrorCodes3, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
-
+import { ContextError as ContextError3, ErrorCodes as ErrorCodes3, TracedAs as TracedAs2 } from "@ai-setting/roy-agent-core";
 class QueryExecutor {
   env;
   sessionComponent;
@@ -8757,33 +8637,16 @@ class QueryExecutor {
       },
       ...agentContext
     };
-    let span;
-    const tracer = getTracerProvider3().getTracer("roy-tracer");
-    const currentContext = tracer.getCurrentContext();
-    span = tracer.startSpan("query-executor.execute", {
-      parent: currentContext,
-      attributes: {
-        query: message.substring(0, 200),
-        sessionId
-      }
-    });
     let result;
     try {
       result = await contextHandler.handleQueryWithContext(message, context);
-      if (span) {
-        span.end(result);
-      }
     } catch (error) {
-      if (span) {
-        span.setAttribute("error", String(error));
-        span.end(undefined, error instanceof Error ? error : new Error(String(error)));
-      }
       if (error instanceof ContextError3 && error.code === ErrorCodes3.CONTEXT_THRESHOLD_EXCEEDED) {
         this.output.error(`上下文阈值超出限制: ${error.usage?.totalTokens}/${error.contextWindow}`);
         this.output.info("请手动压缩会话: roy-agent sessions compact " + sessionId);
       }
       throw error;
-    } finally {}
+    }
     if (!this.quiet) {
       this.output.success("执行完成");
     }
@@ -8836,6 +8699,18 @@ class QueryExecutor {
     }
   }
 }
+__legacyDecorateClassTS([
+  TracedAs2("cli.query-executor.execute", { recordParams: true, log: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    String,
+    String,
+    typeof Partial === "undefined" ? Object : Partial,
+    String,
+    Object
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], QueryExecutor.prototype, "execute", null);
 
 // src/commands/shared/event-message-formatter.ts
 var TaskEventTypes = {
@@ -8970,6 +8845,7 @@ class EventMessageFormatter {
 }
 
 // src/commands/shared/event-handler.ts
+import { TracedAs as TracedAs3 } from "@ai-setting/roy-agent-core";
 class EventHandler {
   env;
   eventTypes;
@@ -9080,10 +8956,18 @@ class EventHandler {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 }
+__legacyDecorateClassTS([
+  TracedAs3("cli.event-handler.handleEvent", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", undefined)
+], EventHandler.prototype, "handleEvent", null);
 
 // src/commands/interactive.ts
 init_stream_output_service();
-import { createLogger as createLogger4, getTracerProvider as getTracerProvider4 } from "@ai-setting/roy-agent-core";
+import { createLogger as createLogger4, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
 
 // src/commands/input-handler.ts
 class InputHandler {
@@ -9343,11 +9227,14 @@ ${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;
+    let pluginEnabled = envEvent.metadata?.pluginEnabled;
+    let plugins = envEvent.metadata?.plugins;
+    if (!pluginEnabled || Object.keys(pluginEnabled).length === 0) {
+      pluginEnabled = {};
+      for (const pluginName of plugins || []) {
+        const key = `${sourceId}:${pluginName}`;
+        pluginEnabled[key] = true;
+      }
     }
     this.currentAgentContext = {
       pluginEnabled,
@@ -9365,11 +9252,21 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     const agentContext = this.currentAgentContext;
     this.currentAgentContext = undefined;
     resetStreamAbort();
-    const provider = getTracerProvider4();
+    const provider = getTracerProvider3();
     const tracer = provider.getTracer("roy-tracer");
-    const rootSpan = tracer.startSpan("interactive.execute");
-    const traceId = rootSpan.spanContext.traceId;
-    provider.setGlobalContext(rootSpan.spanContext);
+    const existingContext = provider.getGlobalContext();
+    let rootSpan;
+    let traceId;
+    if (existingContext) {
+      rootSpan = tracer.startSpan("interactive.execute", {
+        parent: existingContext
+      });
+      traceId = existingContext.traceId;
+    } else {
+      rootSpan = tracer.startSpan("interactive.execute");
+      traceId = rootSpan.spanContext.traceId;
+      provider.setGlobalContext(rootSpan.spanContext);
+    }
     console.log(`${COLORS.system("[Trace] " + traceId)}`);
     console.log(`${COLORS.progress("[thinking...]")}`);
     try {
@@ -9385,8 +9282,12 @@ ${COLORS.error("❌ 执行失败: " + error)}
         rootSpan.setAttribute("error", String(error));
       }
     } finally {
-      provider.setGlobalContext(undefined);
       rootSpan.end();
+      if (existingContext) {
+        provider.setGlobalContext(existingContext);
+      } else {
+        provider.setGlobalContext(undefined);
+      }
       this.isExecuting = false;
       if (options.showPrompt) {
         this.rl.prompt(true);
@@ -9678,18 +9579,6 @@ function createInteractiveCommand(externalEnvService) {
         let memoryPluginInstance = null;
         if (coderPluginNames.length > 0) {
           try {
-            const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-            const { createPluginHookAdapter, createGlobalLSPManager } = await import("@ai-setting/roy-agent-coder-harness");
-            const adapter = createPluginHookAdapter(globalHookManager2, {
-              enableLSP: coderPluginNames.includes("lsp"),
-              enableCodeCheck: coderPluginNames.includes("code-check"),
-              enableReminder: coderPluginNames.includes("reminder"),
-              enableTSLSP: coderPluginNames.includes("tslsp"),
-              enablePylsp: coderPluginNames.includes("pylsp"),
-              enableMdlsp: coderPluginNames.includes("mdlsp")
-            });
-            await adapter.initialize();
-            pluginAdapterDispose = () => adapter.dispose();
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
             if (enabledPlugins.length > 0) {
               console.log(`已启用插件: ${enabledPlugins.join(", ")}`);
@@ -16528,7 +16417,7 @@ var import_yaml = __toESM(require_dist(), 1);
 import chalk55 from "chalk";
 import fs5 from "fs";
 import path8 from "path";
-import { getTracerProvider as getTracerProvider5, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
+import { getTracerProvider as getTracerProvider4, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
 var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   const output = new OutputService;
   const envService = new EnvironmentService(output);
@@ -16549,7 +16438,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   output.info(`[OTel Trace] TRACEPARENT=${traceparent || "none"}, traceId=${traceId}, parentSpanId=${parentSpanId}`);
   let workflowSpan = undefined;
   try {
-    const provider = getTracerProvider5();
+    const provider = getTracerProvider4();
     await provider.initialize();
     const tracer = provider.getTracer("roy-tracer");
     const restoredContext = tracer.getCurrentContext();

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.38",
+    version: "1.5.40",
     type: "module",
     description: "CLI for roy-agent - Non-interactive command execution",
     main: "./dist/index.js",
@@ -7245,8 +7245,8 @@ var require_package = __commonJS((exports, module) => {
       typecheck: "npx tsc --noEmit --skipLibCheck"
     },
     dependencies: {
-      "@ai-setting/roy-agent-coder-harness": "^1.5.36",
-      "@ai-setting/roy-agent-core": "^1.5.36",
+      "@ai-setting/roy-agent-coder-harness": "^1.5.40",
+      "@ai-setting/roy-agent-core": "^1.5.40",
       chalk: "^5.6.2",
       commander: "^14.0.3",
       effect: "^3.21.2",
@@ -7336,7 +7336,8 @@ import {
   McpComponent,
   CommandsComponent,
   MemoryComponent,
-  EventSourceComponent
+  EventSourceComponent,
+  PluginComponent
 } from "@ai-setting/roy-agent-core";
 import { WorkflowComponent } from "@ai-setting/roy-agent-core";
 import { MemoryPlugin } from "@ai-setting/roy-agent-core";
@@ -7403,124 +7404,6 @@ class OutputService {
   }
 }
 
-// src/plugin/registry.ts
-var taskTagPlugin = {
-  info: {
-    name: "task-tag",
-    version: "1.0.0",
-    description: "Intelligent tag suggestion and similar task experience injection"
-  },
-  getComponentPlugins() {
-    return [{
-      name: "task-tag",
-      targetComponent: "task",
-      factory: async () => {
-        const { TaskTagPlugin } = await import("@ai-setting/roy-agent-core");
-        return new TaskTagPlugin;
-      }
-    }];
-  }
-};
-var BUILTIN_PLUGINS = [
-  taskTagPlugin
-];
-
-class PluginRegistry {
-  plugins = new Map;
-  constructor() {
-    for (const plugin of BUILTIN_PLUGINS) {
-      this.registerBuiltin(plugin);
-    }
-  }
-  register(plugin) {
-    if (this.plugins.has(plugin.info.name)) {
-      throw new Error(`Plugin "${plugin.info.name}" is already registered`);
-    }
-    this.plugins.set(plugin.info.name, plugin);
-  }
-  registerBuiltin(plugin) {
-    if (!this.plugins.has(plugin.info.name)) {
-      this.plugins.set(plugin.info.name, plugin);
-    }
-  }
-  unregister(name) {
-    this.plugins.delete(name);
-  }
-  get(name) {
-    return this.plugins.get(name);
-  }
-  has(name) {
-    return this.plugins.has(name);
-  }
-  getAll() {
-    return Array.from(this.plugins.values()).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
-  }
-  get size() {
-    return this.plugins.size;
-  }
-  getAllCommands() {
-    const commands = [];
-    for (const plugin of this.getAll()) {
-      commands.push(...plugin.getCommands?.() ?? []);
-    }
-    return commands;
-  }
-  getAllComponents() {
-    const components = [];
-    for (const plugin of this.getAll()) {
-      components.push(...plugin.getComponents?.() ?? []);
-    }
-    return components;
-  }
-  getAllComponentPlugins() {
-    const componentPlugins = [];
-    for (const plugin of this.getAll()) {
-      componentPlugins.push(...plugin.getComponentPlugins?.() ?? []);
-    }
-    return componentPlugins;
-  }
-  getComponentPlugin(name) {
-    for (const plugin of this.getAll()) {
-      const componentPlugins = plugin.getComponentPlugins?.() ?? [];
-      for (const cp of componentPlugins) {
-        if (cp.name === name) {
-          return cp;
-        }
-      }
-    }
-    return;
-  }
-  *getPluginComponents() {
-    for (const plugin of this.getAll()) {
-      for (const definition of plugin.getComponents?.() ?? []) {
-        yield { plugin, definition };
-      }
-    }
-  }
-  clear() {
-    for (const name of this.plugins.keys()) {
-      const plugin = this.plugins.get(name);
-      if (!BUILTIN_PLUGINS.some((p) => p.info.name === name)) {
-        this.plugins.delete(name);
-      }
-    }
-  }
-  async executeLifecycleHooks(phase, env) {
-    const hookName = phase === "beforeInit" ? "onBeforeInit" : "onAfterInit";
-    for (const plugin of this.getAll()) {
-      const hook = plugin[hookName];
-      if (hook) {
-        try {
-          await hook({ env });
-        } catch (err) {
-          console.warn(`[roy] Plugin "${plugin.info.name}" ${hookName} failed:`, err);
-        }
-      }
-    }
-  }
-}
-var globalPluginRegistry = new PluginRegistry;
-
 // src/services/environment.service.ts
 var logger = createLogger("environment-service");
 var CLI_CONFIG_DIR_NAME = "roy-agent";
@@ -7552,6 +7435,7 @@ class EnvironmentService {
   memoryPlugin;
   eventSourceComponent;
   workflowComponent;
+  pluginComponent;
   constructor(output) {
     this.output = output ?? new OutputService;
   }
@@ -7584,6 +7468,7 @@ class EnvironmentService {
   }
   async dispose() {
     for (const component of [
+      this.pluginComponent,
       this.eventSourceComponent,
       this.memoryComponent,
       this.commandsComponent,
@@ -7813,20 +7698,22 @@ class EnvironmentService {
     env.registerComponent(memoryComponent);
     env.registerComponent(eventSourceComponent);
     env.registerComponent(workflowComponent);
+    this.pluginComponent = new PluginComponent;
+    const pluginComponent = this.pluginComponent;
+    await pluginComponent.init({
+      env,
+      options: {
+        configComponent
+      }
+    });
+    env.registerComponent(pluginComponent);
     this.registerCommandsPromptHook(promptComponent, commandsComponent);
     await env.init();
     await env.start();
     agentComponent.refreshDependencies();
     logger.debug("[EnvironmentService] AgentComponent dependencies refreshed after env.start()");
     if (options?.plugins && options.plugins.length > 0) {
-      await this.loadComponentPlugins(options.plugins, {
-        task: taskComponent,
-        memory: memoryComponent,
-        llm: llmComponent
-      });
-    }
-    if (options?.plugins && options.plugins.length > 0) {
-      await this.loadCoderPlugins(options.plugins);
+      await this.loadPlugins(options.plugins);
     }
     this.environment = env;
     return env;
@@ -7853,27 +7740,54 @@ class EnvironmentService {
     });
     this.output.info("Registered commands-prompt Hook");
   }
-  async loadComponentPlugins(pluginNames, components) {
+  async loadPlugins(pluginNames) {
     for (const name of pluginNames) {
       try {
-        const definition = globalPluginRegistry.getComponentPlugin(name);
-        if (!definition) {
-          this.output.warn(`[EnvironmentService] Component plugin not found: ${name}`);
-          continue;
-        }
-        const plugin = await definition.factory();
-        const targetComponent = components[definition.targetComponent];
-        if (targetComponent && typeof targetComponent.registerPlugin === "function") {
-          targetComponent.registerPlugin(plugin);
-          const registeredPlugins = targetComponent.listPlugins?.() || [];
-          const isRegistered = registeredPlugins.some((p) => p.name === plugin.name);
-          this.output.log(`[EnvironmentService] Loaded component plugin: ${name} -> ${definition.targetComponent}`);
-          this.output.log(`[EnvironmentService] Plugin verified: ${isRegistered ? "YES" : "NO"} (${plugin.name} in ${definition.targetComponent})`);
-        } else {
-          this.output.warn(`[EnvironmentService] Target component not found or not registerable: ${definition.targetComponent}`);
+        let plugin;
+        switch (name) {
+          case "task-tag": {
+            const { TaskTagPlugin } = await import("@ai-setting/roy-agent-core");
+            plugin = new TaskTagPlugin;
+            break;
+          }
+          case "lsp": {
+            const { LSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new LSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "code-check": {
+            const { CodeCheckPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new CodeCheckPlugin;
+            break;
+          }
+          case "reminder": {
+            const { ReminderPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new ReminderPlugin;
+            break;
+          }
+          case "tslsp": {
+            const { TSLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new TSLSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "pylsp": {
+            const { PyLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new PyLSPPlugin({ preloadMode: "startup" });
+            break;
+          }
+          case "mdlsp": {
+            const { MDLSPPlugin } = await import("@ai-setting/roy-agent-coder-harness");
+            plugin = new MDLSPPlugin;
+            break;
+          }
+          default:
+            this.output.warn(`[EnvironmentService] Unknown plugin: ${name}`);
+            continue;
         }
+        this.pluginComponent?.register(plugin);
+        this.output.log(`[EnvironmentService] Registered plugin: ${name}`);
       } catch (error) {
-        this.output.error(`[EnvironmentService] Error loading component plugin "${name}": ${error}`);
+        this.output.error(`[EnvironmentService] Error loading plugin "${name}": ${error}`);
       }
     }
   }
@@ -7891,22 +7805,6 @@ ${rows}
 
 Progressive Discovery: Run \`<command> --help\` to explore full capabilities.`;
   }
-  async loadCoderPlugins(pluginNames) {
-    const { createPluginHookAdapter } = await import("@ai-setting/roy-agent-coder-harness");
-    const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-    const pluginConfigs = {
-      enableLSP: pluginNames.includes("lsp"),
-      enableCodeCheck: pluginNames.includes("code-check"),
-      enableReminder: pluginNames.includes("reminder")
-    };
-    if (!pluginConfigs.enableLSP && !pluginConfigs.enableCodeCheck && !pluginConfigs.enableReminder) {
-      return;
-    }
-    const hookManager = globalHookManager2;
-    const adapter = createPluginHookAdapter(hookManager, pluginConfigs);
-    await adapter.initialize();
-    this.output.log(`[EnvironmentService] Loaded coder plugins: ${pluginNames.join(", ")}`);
-  }
 }
 
 // src/commands/act.ts
@@ -8405,64 +8303,47 @@ function createActCommand(externalEnvService) {
         if (llmComponent && promptComponent) {
           sessionComponent.setSummaryComponents(promptComponent, llmComponent);
         }
-        if (coderPluginNames.length > 0) {
+        if (coderPluginNames.includes("lsp")) {
           try {
-            const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-            const { createPluginHookAdapter, createGlobalLSPManager } = await import("@ai-setting/roy-agent-coder-harness");
-            const adapter = createPluginHookAdapter(globalHookManager2, {
-              enableLSP: coderPluginNames.includes("lsp"),
-              enableCodeCheck: coderPluginNames.includes("code-check"),
-              enableReminder: coderPluginNames.includes("reminder"),
-              enableTSLSP: coderPluginNames.includes("tslsp"),
-              enablePylsp: coderPluginNames.includes("pylsp"),
-              enableMdlsp: coderPluginNames.includes("mdlsp")
-            });
-            await adapter.initialize();
-            pluginAdapterDispose = () => adapter.dispose();
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
             if (enabledPlugins.length > 0) {
               console.log(`已启用插件: ${enabledPlugins.join(", ")}`);
               output.success(`✅ 已启用插件: ${enabledPlugins.join(", ")}`);
-              if (coderPluginNames.includes("lsp") && !quiet) {
+              if (!quiet) {
                 output.info(`\uD83D\uDD27 LSP 服务预加载中，首次诊断可能需要等待...`);
               }
             }
-            if (coderPluginNames.includes("lsp")) {
-              try {
-                const { createLSPConfigLoader } = await import("@ai-setting/roy-agent-coder-harness");
-                const configLoader = createLSPConfigLoader();
-                const lspConfig = configLoader.load();
+            const { createLSPConfigLoader } = await import("@ai-setting/roy-agent-coder-harness");
+            const configLoader = createLSPConfigLoader();
+            const lspConfig = configLoader.load();
+            if (!quiet) {
+              output.info("正在预热 LSP 服务器...");
+              if (lspConfig.preload) {
+                output.info("\uD83D\uDCCB 使用配置文件中的预加载设置");
+              }
+            }
+            const { createGlobalLSPManager: createGlobalLSPManager2 } = await import("@ai-setting/roy-agent-coder-harness");
+            const lspManager = createGlobalLSPManager2({
+              idleTimeout: lspConfig.idleTimeout ?? 300000,
+              maxConnections: lspConfig.maxConnections ?? 10,
+              autoDownload: lspConfig.autoInstall ?? false,
+              preloadLanguages: lspConfig.preloadLanguages
+            });
+            lspManager.registerShutdownHandler();
+            lspManagerDispose = () => lspManager.dispose();
+            if (lspConfig.preload || coderPluginNames.includes("lsp")) {
+              lspManager.prewarm().then(() => {
                 if (!quiet) {
-                  output.info("正在预热 LSP 服务器...");
-                  if (lspConfig.preload) {
-                    output.info("\uD83D\uDCCB 使用配置文件中的预加载设置");
-                  }
+                  output.success("✅ LSP 服务器预热完成");
                 }
-                const lspManager = createGlobalLSPManager({
-                  idleTimeout: lspConfig.idleTimeout ?? 300000,
-                  maxConnections: lspConfig.maxConnections ?? 10,
-                  autoDownload: lspConfig.autoInstall ?? false,
-                  preloadLanguages: lspConfig.preloadLanguages
-                });
-                lspManager.registerShutdownHandler();
-                lspManagerDispose = () => lspManager.dispose();
-                if (lspConfig.preload || coderPluginNames.includes("lsp")) {
-                  lspManager.prewarm().then(() => {
-                    if (!quiet) {
-                      output.success("✅ LSP 服务器预热完成");
-                    }
-                  }).catch((err) => {
-                    if (!quiet) {
-                      output.warn(`⚠ LSP 预热部分失败: ${err.message}`);
-                    }
-                  });
+              }).catch((err) => {
+                if (!quiet) {
+                  output.warn(`⚠ LSP 预热部分失败: ${err.message}`);
                 }
-              } catch (error) {
-                output.warn(`⚠ LSP 预热失败: ${error}`);
-              }
+              });
             }
           } catch (error) {
-            output.error(`❌ 加载 coder-harness 插件失败: ${error}`);
+            output.warn(`⚠ LSP 预热失败: ${error}`);
           }
         }
         const streamService = new StreamOutputService({
@@ -8653,8 +8534,7 @@ class SessionManager {
 
 // src/commands/shared/query-executor.ts
 init_stream_output_service();
-import { ContextError as ContextError3, ErrorCodes as ErrorCodes3, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
-
+import { ContextError as ContextError3, ErrorCodes as ErrorCodes3, TracedAs as TracedAs2 } from "@ai-setting/roy-agent-core";
 class QueryExecutor {
   env;
   sessionComponent;
@@ -8756,33 +8636,16 @@ class QueryExecutor {
       },
       ...agentContext
     };
-    let span;
-    const tracer = getTracerProvider3().getTracer("roy-tracer");
-    const currentContext = tracer.getCurrentContext();
-    span = tracer.startSpan("query-executor.execute", {
-      parent: currentContext,
-      attributes: {
-        query: message.substring(0, 200),
-        sessionId
-      }
-    });
     let result;
     try {
       result = await contextHandler.handleQueryWithContext(message, context);
-      if (span) {
-        span.end(result);
-      }
     } catch (error) {
-      if (span) {
-        span.setAttribute("error", String(error));
-        span.end(undefined, error instanceof Error ? error : new Error(String(error)));
-      }
       if (error instanceof ContextError3 && error.code === ErrorCodes3.CONTEXT_THRESHOLD_EXCEEDED) {
         this.output.error(`上下文阈值超出限制: ${error.usage?.totalTokens}/${error.contextWindow}`);
         this.output.info("请手动压缩会话: roy-agent sessions compact " + sessionId);
       }
       throw error;
-    } finally {}
+    }
     if (!this.quiet) {
       this.output.success("执行完成");
     }
@@ -8835,6 +8698,18 @@ class QueryExecutor {
     }
   }
 }
+__legacyDecorateClassTS([
+  TracedAs2("cli.query-executor.execute", { recordParams: true, log: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    String,
+    String,
+    typeof Partial === "undefined" ? Object : Partial,
+    String,
+    Object
+  ]),
+  __legacyMetadataTS("design:returntype", typeof Promise === "undefined" ? Object : Promise)
+], QueryExecutor.prototype, "execute", null);
 
 // src/commands/shared/event-message-formatter.ts
 var TaskEventTypes = {
@@ -8969,6 +8844,7 @@ class EventMessageFormatter {
 }
 
 // src/commands/shared/event-handler.ts
+import { TracedAs as TracedAs3 } from "@ai-setting/roy-agent-core";
 class EventHandler {
   env;
   eventTypes;
@@ -9079,10 +8955,18 @@ class EventHandler {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 }
+__legacyDecorateClassTS([
+  TracedAs3("cli.event-handler.handleEvent", { recordParams: true }),
+  __legacyMetadataTS("design:type", Function),
+  __legacyMetadataTS("design:paramtypes", [
+    typeof EnvEvent === "undefined" ? Object : EnvEvent
+  ]),
+  __legacyMetadataTS("design:returntype", undefined)
+], EventHandler.prototype, "handleEvent", null);
 
 // src/commands/interactive.ts
 init_stream_output_service();
-import { createLogger as createLogger4, getTracerProvider as getTracerProvider4 } from "@ai-setting/roy-agent-core";
+import { createLogger as createLogger4, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
 
 // src/commands/input-handler.ts
 class InputHandler {
@@ -9342,11 +9226,14 @@ ${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;
+    let pluginEnabled = envEvent.metadata?.pluginEnabled;
+    let plugins = envEvent.metadata?.plugins;
+    if (!pluginEnabled || Object.keys(pluginEnabled).length === 0) {
+      pluginEnabled = {};
+      for (const pluginName of plugins || []) {
+        const key = `${sourceId}:${pluginName}`;
+        pluginEnabled[key] = true;
+      }
     }
     this.currentAgentContext = {
       pluginEnabled,
@@ -9364,11 +9251,21 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
     const agentContext = this.currentAgentContext;
     this.currentAgentContext = undefined;
     resetStreamAbort();
-    const provider = getTracerProvider4();
+    const provider = getTracerProvider3();
     const tracer = provider.getTracer("roy-tracer");
-    const rootSpan = tracer.startSpan("interactive.execute");
-    const traceId = rootSpan.spanContext.traceId;
-    provider.setGlobalContext(rootSpan.spanContext);
+    const existingContext = provider.getGlobalContext();
+    let rootSpan;
+    let traceId;
+    if (existingContext) {
+      rootSpan = tracer.startSpan("interactive.execute", {
+        parent: existingContext
+      });
+      traceId = existingContext.traceId;
+    } else {
+      rootSpan = tracer.startSpan("interactive.execute");
+      traceId = rootSpan.spanContext.traceId;
+      provider.setGlobalContext(rootSpan.spanContext);
+    }
     console.log(`${COLORS.system("[Trace] " + traceId)}`);
     console.log(`${COLORS.progress("[thinking...]")}`);
     try {
@@ -9384,8 +9281,12 @@ ${COLORS.error("❌ 执行失败: " + error)}
         rootSpan.setAttribute("error", String(error));
       }
     } finally {
-      provider.setGlobalContext(undefined);
       rootSpan.end();
+      if (existingContext) {
+        provider.setGlobalContext(existingContext);
+      } else {
+        provider.setGlobalContext(undefined);
+      }
       this.isExecuting = false;
       if (options.showPrompt) {
         this.rl.prompt(true);
@@ -9677,18 +9578,6 @@ function createInteractiveCommand(externalEnvService) {
         let memoryPluginInstance = null;
         if (coderPluginNames.length > 0) {
           try {
-            const { globalHookManager: globalHookManager2 } = await import("@ai-setting/roy-agent-core");
-            const { createPluginHookAdapter, createGlobalLSPManager } = await import("@ai-setting/roy-agent-coder-harness");
-            const adapter = createPluginHookAdapter(globalHookManager2, {
-              enableLSP: coderPluginNames.includes("lsp"),
-              enableCodeCheck: coderPluginNames.includes("code-check"),
-              enableReminder: coderPluginNames.includes("reminder"),
-              enableTSLSP: coderPluginNames.includes("tslsp"),
-              enablePylsp: coderPluginNames.includes("pylsp"),
-              enableMdlsp: coderPluginNames.includes("mdlsp")
-            });
-            await adapter.initialize();
-            pluginAdapterDispose = () => adapter.dispose();
             const enabledPlugins = coderPluginNames.filter((p) => CODER_HARNESS_PLUGINS.has(p.split(":")[0]));
             if (enabledPlugins.length > 0) {
               console.log(`已启用插件: ${enabledPlugins.join(", ")}`);
@@ -16527,7 +16416,7 @@ var import_yaml = __toESM(require_dist(), 1);
 import chalk55 from "chalk";
 import fs5 from "fs";
 import path8 from "path";
-import { getTracerProvider as getTracerProvider5, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
+import { getTracerProvider as getTracerProvider4, propagation, wrapFunction } from "@ai-setting/roy-agent-core";
 var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   const output = new OutputService;
   const envService = new EnvironmentService(output);
@@ -16548,7 +16437,7 @@ var runWorkflow = wrapFunction(async function runWorkflowImpl(args) {
   output.info(`[OTel Trace] TRACEPARENT=${traceparent || "none"}, traceId=${traceId}, parentSpanId=${parentSpanId}`);
   let workflowSpan = undefined;
   try {
-    const provider = getTracerProvider5();
+    const provider = getTracerProvider4();
     await provider.initialize();
     const tracer = provider.getTracer("roy-tracer");
     const restoredContext = tracer.getCurrentContext();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.5.38",
+  "version": "1.5.40",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",
@@ -26,8 +26,8 @@
     "typecheck": "npx tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@ai-setting/roy-agent-coder-harness": "^1.5.36",
-    "@ai-setting/roy-agent-core": "^1.5.36",
+    "@ai-setting/roy-agent-coder-harness": "^1.5.40",
+    "@ai-setting/roy-agent-core": "^1.5.40",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "effect": "^3.21.2",