@ai-setting/roy-agent-cli 1.6.41 → 1.7.0

package/dist/index.js

@@ -796,99 +796,6 @@ var init_welcome_card = __esm(() => {
   ];
 });
 
-// package.json
-var require_package = __commonJS((exports, module) => {
-  module.exports = {
-    name: "@ai-setting/roy-agent-cli",
-    version: "1.6.41",
-    type: "module",
-    description: "CLI for roy-agent - Non-interactive command execution",
-    main: "./dist/index.js",
-    module: "./dist/index.js",
-    types: "./dist/index.d.ts",
-    bin: {
-      "roy-agent": "./dist/bin/roy-agent.js"
-    },
-    exports: {
-      ".": {
-        import: "./dist/index.js",
-        types: "./dist/index.d.ts"
-      },
-      "./package.json": "./package.json"
-    },
-    files: [
-      "dist/**/*",
-      "README.md"
-    ],
-    scripts: {
-      build: "bunup && bun run postbuild",
-      postbuild: "bun run scripts/postbuild.ts",
-      clean: "rm -rf dist",
-      lint: "eslint --max-warnings 0 src/",
-      "lint:fix": "eslint --fix src/",
-      typecheck: "npx tsc --noEmit --skipLibCheck"
-    },
-    dependencies: {
-      "@ai-setting/roy-agent-coder-harness": "^1.5.50",
-      "@ai-setting/roy-agent-core": "^1.5.83",
-      "@ai-setting/roy-agent-ontology-harness": "^1.5.47",
-      "@clack/prompts": "^1.7.0",
-      chalk: "^5.6.2",
-      "cli-highlight": "^2.1.11",
-      commander: "^14.0.3",
-      effect: "^3.21.2",
-      ink: "^5.2.1",
-      "ink-text-input": "^6.0.0",
-      marked: "^18.0.7",
-      pyright: "^1.1.409",
-      react: "^18",
-      "react-devtools-core": "^7.0.1",
-      "react-dom": "^18",
-      "typescript-language-server": "^5.1.3",
-      "vscode-css-languageserver-bin": "^1.4.0",
-      "vscode-html-languageserver-bin": "^1.4.0",
-      "vscode-json-languageserver": "^1.3.4",
-      yargs: "^17.7.2",
-      "zod-to-json-schema": "^3.25.2"
-    },
-    devDependencies: {
-      "@types/node": "^20.10.0",
-      "@types/react": "^18",
-      "@types/react-dom": "^18",
-      "@types/yargs": "^17.0.32",
-      "@typescript-eslint/parser": "^8.62.1",
-      bunup: "^0.16.0",
-      eslint: "^10.6.0",
-      "ink-testing-library": "^4.0.0",
-      typescript: "^5.3.0"
-    },
-    engines: {
-      node: ">=18.0.0"
-    },
-    repository: {
-      type: "git",
-      url: "https://github.com/ai-setting/roy-agent.git",
-      directory: "packages/cli"
-    },
-    publishConfig: {
-      registry: "https://registry.npmjs.org",
-      access: "public"
-    },
-    keywords: [
-      "roy-agent",
-      "agent",
-      "ai",
-      "cli",
-      "command-line"
-    ],
-    author: "ai-setting",
-    license: "MIT",
-    bugs: {
-      url: "https://github.com/ai-setting/roy-agent/issues"
-    }
-  };
-});
-
 // src/commands/shared/clipboard-helper.ts
 var exports_clipboard_helper = {};
 __export(exports_clipboard_helper, {
@@ -9550,6 +9457,105 @@ class CliQuietModeService {
     setCoreQuietMode(false);
   }
 }
+// package.json
+var package_default = {
+  name: "@ai-setting/roy-agent-cli",
+  version: "1.7.0",
+  type: "module",
+  description: "CLI for roy-agent - Non-interactive command execution",
+  main: "./dist/index.js",
+  module: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  bin: {
+    "roy-agent": "./dist/bin/roy-agent.js"
+  },
+  exports: {
+    ".": {
+      import: "./dist/index.js",
+      types: "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  files: [
+    "dist/**/*",
+    "README.md"
+  ],
+  scripts: {
+    build: "bunup && bun run postbuild",
+    postbuild: "bun run scripts/postbuild.ts",
+    clean: "rm -rf dist",
+    lint: "eslint --max-warnings 0 src/",
+    "lint:fix": "eslint --fix src/",
+    typecheck: "npx tsc --noEmit --skipLibCheck"
+  },
+  dependencies: {
+    "@ai-setting/roy-agent-coder-harness": "^1.5.50",
+    "@ai-setting/roy-agent-core": "^1.5.83",
+    "@ai-setting/roy-agent-ontology-harness": "^1.5.47",
+    "@clack/prompts": "^1.7.0",
+    chalk: "^5.6.2",
+    "cli-highlight": "^2.1.11",
+    commander: "^14.0.3",
+    effect: "^3.21.2",
+    ink: "^5.2.1",
+    "ink-text-input": "^6.0.0",
+    marked: "^18.0.7",
+    pyright: "^1.1.409",
+    react: "^18",
+    "react-devtools-core": "^7.0.1",
+    "react-dom": "^18",
+    "typescript-language-server": "^5.1.3",
+    "vscode-css-languageserver-bin": "^1.4.0",
+    "vscode-html-languageserver-bin": "^1.4.0",
+    "vscode-json-languageserver": "^1.3.4",
+    yargs: "^17.7.2",
+    "zod-to-json-schema": "^3.25.2",
+    "@earendil-works/pi-ai": "^0.74.2"
+  },
+  devDependencies: {
+    "@types/node": "^20.10.0",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "@types/yargs": "^17.0.32",
+    "@typescript-eslint/parser": "^8.62.1",
+    bunup: "^0.16.0",
+    eslint: "^10.6.0",
+    "ink-testing-library": "^4.0.0",
+    typescript: "^5.3.0"
+  },
+  engines: {
+    node: ">=18.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "https://github.com/ai-setting/roy-agent.git",
+    directory: "packages/cli"
+  },
+  publishConfig: {
+    registry: "https://registry.npmjs.org",
+    access: "public"
+  },
+  keywords: [
+    "roy-agent",
+    "agent",
+    "ai",
+    "cli",
+    "command-line"
+  ],
+  author: "ai-setting",
+  license: "MIT",
+  bugs: {
+    url: "https://github.com/ai-setting/roy-agent/issues"
+  }
+};
+
+// src/lib/version.ts
+function getPackageVersion() {
+  if (typeof ROY_AGENT_VERSION !== "undefined") {
+    return ROY_AGENT_VERSION;
+  }
+  return package_default.version;
+}
 
 // src/commands/act.ts
 import { execFile, execFileSync } from "node:child_process";
@@ -12269,12 +12275,6 @@ var COLOR_BY_STATUS = {
   running: COLORS.accent,
   busy: COLORS.accent
 };
-// src/lib/version.ts
-var import__package = __toESM(require_package(), 1);
-function getPackageVersion() {
-  return import__package.default.version;
-}
-
 // src/commands/interactive.ts
 var logger4 = createLogger5("cli:interactive");
 var USER_PROMPT = COLORS.accent("❯ ");
@@ -13380,6 +13380,9 @@ function createInteractiveCommand(externalEnvService) {
               showToolCalls: args.toolCalls,
               showToolResults: args.toolResults
             }, traceId, mergedContext);
+            if (result && !queryExecutor.getFullText()) {
+              console.log(result);
+            }
             repl.setLastUsage(queryExecutor.getLastUsage());
             return result;
           },
@@ -13518,7 +13521,7 @@ import React6 from "react";
 import { render } from "ink";
 
 // src/RunTui.tsx
-import { useState as useState6, useCallback as useCallback4, useRef as useRef2 } from "react";
+import { useState as useState6, useCallback as useCallback4, useRef as useRef2, useEffect as useEffect5 } from "react";
 import { Box as Box6, Text as Text8, useApp as useApp2 } from "ink";
 
 // src/tui/App.tsx
@@ -13830,7 +13833,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13839,7 +13842,7 @@ function useStreamingAccumulator() {
     let snapshot = "";
     setStreamingText((prev) => {
       snapshot = prev;
-      return prev;
+      return "";
     });
     return snapshot;
   }, []);
@@ -13930,7 +13933,8 @@ var RunScreen = ({
   workdir,
   maxLines: initialMaxLines,
   markdownEnabled: markdownEnabled2,
-  onExit
+  onExit,
+  onRegisterHandlers
 }) => {
   const [history, setHistory] = useState6([]);
   const [errorMessage, setErrorMessage] = useState6(null);
@@ -13941,11 +13945,60 @@ var RunScreen = ({
   const { exit } = useApp2();
   const userTurnCountRef = useRef2(0);
   const assistantTurnCountRef = useRef2(0);
+  const isProcessingRef = useRef2(0);
+  const executeQueryRef = useRef2(null);
   const width = process.stdout.columns ?? 80;
   const doExit = useCallback4(() => {
     onExit?.();
     exit();
   }, [onExit, exit]);
+  const executeQuery = useCallback4(async (message) => {
+    isProcessingRef.current += 1;
+    stream.start();
+    try {
+      let responseText;
+      if (streamHandleQuery) {
+        responseText = await streamHandleQuery(message, (chunk) => stream.append(chunk));
+      } else {
+        responseText = await handleQuery(message);
+      }
+      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
+      const finalText = truncateForTerminal(rendered, maxLines);
+      stream.finish();
+      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
+      assistantTurnCountRef.current += 1;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      stream.fail(err instanceof Error ? err : new Error(msg));
+      setErrorMessage(msg);
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `❌ Error: ${msg}` }
+      ]);
+    } finally {
+      isProcessingRef.current -= 1;
+    }
+  }, [handleQuery, markdownEnabled2, maxLines, stream, streamHandleQuery, width]);
+  useEffect5(() => {
+    executeQueryRef.current = executeQuery;
+  }, [executeQuery]);
+  useEffect5(() => {
+    if (!onRegisterHandlers)
+      return;
+    const handleNotification = async (message, _envEvent) => {
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: `\uD83D\uDCE2 ${message}` }
+      ]);
+      if (executeQueryRef.current) {
+        await executeQueryRef.current(message);
+      }
+    };
+    const isIdle = () => {
+      return isProcessingRef.current === 0;
+    };
+    onRegisterHandlers({ onNotification: handleNotification, isIdle });
+  }, [onRegisterHandlers]);
   const handleSubmit = useCallback4(async (raw) => {
     const trimmed = raw.trim();
     if (!trimmed)
@@ -14007,38 +14060,14 @@ var RunScreen = ({
     setHistory((h) => [...h, { role: "user", content: trimmed }]);
     setUserHistory((uh) => [trimmed, ...uh]);
     userTurnCountRef.current += 1;
-    stream.start();
-    try {
-      let responseText;
-      if (streamHandleQuery) {
-        responseText = await streamHandleQuery(trimmed, (chunk) => stream.append(chunk));
-      } else {
-        responseText = await handleQuery(trimmed);
-      }
-      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
-      const finalText = truncateForTerminal(rendered, maxLines);
-      stream.finish();
-      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
-      assistantTurnCountRef.current += 1;
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      stream.fail(err instanceof Error ? err : new Error(msg));
-      setErrorMessage(msg);
-      setHistory((h) => [
-        ...h,
-        { role: "tool", content: `❌ Error: ${msg}` }
-      ]);
-    }
+    await executeQuery(trimmed);
   }, [
     doExit,
     exit,
-    handleQuery,
-    markdownEnabled2,
+    executeQuery,
     maxLines,
     model,
-    stream,
-    streamHandleQuery,
-    width
+    workdir
   ]);
   const handleCancel = useCallback4(() => {
     doExit();
@@ -14081,7 +14110,7 @@ var RunTui_default = RunScreen;
 
 // src/commands/run.ts
 init_markdown();
-async function loadHandleQuery(options) {
+async function loadHandleQuery(options, hooks) {
   const quiet = CliQuietModeService.getInstance().isQuiet();
   const output = new OutputService2;
   output.configure({ quiet });
@@ -14098,10 +14127,126 @@ async function loadHandleQuery(options) {
   if (!env) {
     throw new Error("Failed to create environment");
   }
-  return async (message) => {
-    const result = await env.handle_query(message, {
-      sessionId: "cli-run"
+  const sessionComponent = envService.getSession();
+  if (!sessionComponent) {
+    throw new Error("Failed to create session component");
+  }
+  const sessionManager = new SessionManager({
+    sessionComponent,
+    output,
+    quiet: true
+  });
+  const sessionResult = await sessionManager.init(options.session, options.continue);
+  const sessionId = sessionResult.sessionId;
+  const queryExecutor = new QueryExecutor({
+    env,
+    sessionComponent,
+    output,
+    quiet: true,
+    silent: true
+  });
+  let agentContext = undefined;
+  if (options.agent && options.agent !== "default") {
+    const agentComponent = env.getComponent("agent");
+    const validation = validateActAgent(agentComponent, options.agent);
+    if (!validation.valid) {
+      output.error(validation.message);
+      output.info("提示: roy-agent agents list");
+      process.exit(1);
+    }
+    agentContext = buildActAgentContext(options.agent);
+  }
+  let eventSourceSystemPrompt;
+  const rawEventSourceIds = options.eventSource;
+  const eventSourceIds = Array.isArray(rawEventSourceIds) ? rawEventSourceIds.filter((s) => !!s) : rawEventSourceIds ? [rawEventSourceIds] : [];
+  if (eventSourceIds.length > 0) {
+    const eventSourceComponent = env.getComponent("event-source");
+    if (!eventSourceComponent || typeof eventSourceComponent.startSource !== "function") {
+      output.error("❌ 未找到事件源组件或 startSource 方法");
+      output.info("请确保 EventSourceComponent 已正确注册");
+      process.exit(1);
+    }
+    const summary = await startEventSources(eventSourceIds, eventSourceComponent, output);
+    const preloadedPrompts = collectEventSourceSystemPrompts(eventSourceIds, eventSourceComponent);
+    eventSourceSystemPrompt = preloadedPrompts.length > 0 ? joinResolvedSystemPrompts(preloadedPrompts) : undefined;
+    if (eventSourceIds.length === 1 && summary.failedCount > 0) {
+      process.exit(1);
+    }
+  }
+  const llmComponent = envService.getLLM();
+  queryExecutor.initStreamOutput(llmComponent ?? null);
+  const handleQuery = async (message) => {
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
+    return String(result ?? "");
+  };
+  const taskEventHandler = new TaskEventHandler({
+    env,
+    enabled: true
+  });
+  const eventHandler = new EventHandler({
+    env,
+    eventTypes: ["task.background.*", "event-source.event.*"],
+    formatter: new EventMessageFormatter({ prefix: "[通知]" }),
+    isIdle: hooks?.isIdle ?? (() => true),
+    sessionComponent,
+    onEvent: async (_message) => {},
+    onEventWithEnv: async (formattedEvent) => {
+      if (hooks?.onNotification) {
+        await hooks.onNotification(formattedEvent.message, formattedEvent.envEvent);
+      }
+    }
+  });
+  return {
+    handleQuery,
+    envService,
+    env,
+    sessionId,
+    queryExecutor,
+    agentContext,
+    eventSourceSystemPrompt,
+    sessionComponent,
+    eventHandler,
+    taskEventHandler
+  };
+}
+function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
+  return async (message, onChunk) => {
+    queryExecutor.setChunkCallback((event) => {
+      if (event.type === "llm.text") {
+        if (event.delta) {
+          onChunk(event.delta);
+        } else if (event.content) {
+          onChunk(event.content);
+        }
+      }
     });
+    const mergedContext = {
+      ...agentContext,
+      model: options.model,
+      eventSourceSystemPrompt,
+      metadata: {
+        ...agentContext?.metadata ?? {},
+        defaultAgentName: options.defaultAgentName
+      }
+    };
+    const result = await queryExecutor.execute(message, sessionId, {
+      showReasoning: options.reasoning ?? true,
+      showToolCalls: options.toolCalls ?? true,
+      showToolResults: options.toolResults ?? false
+    }, undefined, mergedContext);
     return String(result ?? "");
   };
 }
@@ -14141,6 +14286,41 @@ function createRunCommand() {
     }).option("env", {
       type: "string",
       describe: "Environment name"
+    }).option("session", {
+      type: "string",
+      describe: "指定会话 ID（注: -s 已被 --system-prompt 占用）"
+    }).option("continue", {
+      alias: "c",
+      type: "boolean",
+      describe: "继续上次会话",
+      default: false
+    }).option("reasoning", {
+      alias: "r",
+      type: "boolean",
+      describe: "显示 AI 思考过程",
+      default: true
+    }).option("tool-calls", {
+      type: "boolean",
+      describe: "显示工具调用",
+      default: true
+    }).option("tool-results", {
+      type: "boolean",
+      describe: "显示工具执行结果",
+      default: false
+    }).option("event-source", {
+      alias: "es",
+      type: "array",
+      string: true,
+      describe: "启动时一并启动的事件源 ID（可多次指定，支持 --es a --es b）"
+    }).option("agent", {
+      alias: "a",
+      type: "string",
+      describe: "指定使用的 agent (如 explore, general)"
+    }).option("default-agent-name", {
+      alias: "dan",
+      type: "string",
+      describe: "Default agent 名字（默认 Roy，可被覆盖）",
+      default: "Roy"
     }),
     handler: async (argv) => {
       if (argv.markdown === false) {
@@ -14149,18 +14329,44 @@ function createRunCommand() {
         setMarkdownEnabled(true);
       }
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
-      const handleQuery = await loadHandleQuery(argv);
+      const runState = {
+        isIdle: () => true,
+        onNotification: () => {}
+      };
+      const {
+        handleQuery,
+        queryExecutor,
+        sessionId,
+        agentContext,
+        eventSourceSystemPrompt,
+        eventHandler,
+        taskEventHandler
+      } = await loadHandleQuery(argv, {
+        isIdle: () => runState.isIdle(),
+        onNotification: (msg, envEvent) => runState.onNotification(msg, envEvent)
+      });
+      const streamHandleQuery = createStreamHandleQuery(queryExecutor, sessionId, argv, agentContext, eventSourceSystemPrompt);
+      const stopEventHandler = eventHandler.start();
+      const stopTaskEventHandler = taskEventHandler.start();
       const { waitUntilExit } = render(React6.createElement(RunTui_default, {
         handleQuery,
+        streamHandleQuery,
         model: argv.model,
         workdir: argv.workdir,
         maxLines,
         markdownEnabled: argv.markdown !== false,
+        onRegisterHandlers: (handlers) => {
+          runState.onNotification = handlers.onNotification;
+          runState.isIdle = handlers.isIdle;
+        },
         onExit: () => {}
       }), { exitOnCtrlC: true });
       try {
         await waitUntilExit();
       } finally {
+        stopEventHandler();
+        stopTaskEventHandler();
+        queryExecutor.dispose();
         process.exit(0);
       }
     }
@@ -14173,7 +14379,7 @@ import React8 from "react";
 import { render as render2 } from "ink";
 
 // src/ChatTui.tsx
-import { useEffect as useEffect5, useState as useState7 } from "react";
+import { useEffect as useEffect6, useState as useState7 } from "react";
 import { Box as Box7, useApp as useApp3 } from "ink";
 init_markdown();
 import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
@@ -14192,7 +14398,7 @@ var ChatScreen = ({
   const stream = useStreamingAccumulator();
   const { exit } = useApp3();
   const width = process.stdout.columns ?? 80;
-  useEffect5(() => {
+  useEffect6(() => {
     let cancelled = false;
     stream.start();
     (async () => {
@@ -25056,10 +25262,10 @@ var LspInstallCommand = {
       console.log(`
 \uD83D\uDCE6 LSP Server Status
 `);
-      for (const pkg2 of LSP_PACKAGES) {
-        const isInstalled = installed.includes(pkg2.serverId);
+      for (const pkg of LSP_PACKAGES) {
+        const isInstalled = installed.includes(pkg.serverId);
         const status = isInstalled ? "✓ installed" : "✗ not installed";
-        console.log(`  ${status.padEnd(20)} ${pkg2.serverId.padEnd(12)} ${pkg2.description}`);
+        console.log(`  ${status.padEnd(20)} ${pkg.serverId.padEnd(12)} ${pkg.description}`);
       }
       console.log(`
 ${installed.length}/${LSP_PACKAGES.length} installed
@@ -25110,10 +25316,10 @@ ${installed.length}/${LSP_PACKAGES.length} installed
       console.log(`
 \uD83D\uDCE6 Available LSP Servers
 `);
-      for (const pkg2 of LSP_PACKAGES) {
-        const isInstalled = installer.isInstalled(pkg2.npmPackage);
+      for (const pkg of LSP_PACKAGES) {
+        const isInstalled = installer.isInstalled(pkg.npmPackage);
         const status = isInstalled ? "✓" : "○";
-        console.log(`  ${status} ${pkg2.serverId.padEnd(12)} ${pkg2.description}`);
+        console.log(`  ${status} ${pkg.serverId.padEnd(12)} ${pkg.description}`);
       }
       console.log(`
   Run 'roy-agent lsp install <language>' to install specific servers`);
@@ -25142,11 +25348,11 @@ var LspListCommand = {
     const installer = createInstaller2();
     const installed = installer.getInstalledPackages();
     if (argv.json) {
-      const result = LSP_PACKAGES2.map((pkg2) => ({
-        serverId: pkg2.serverId,
-        npmPackage: pkg2.npmPackage,
-        description: pkg2.description,
-        installed: installed.includes(pkg2.serverId)
+      const result = LSP_PACKAGES2.map((pkg) => ({
+        serverId: pkg.serverId,
+        npmPackage: pkg.npmPackage,
+        description: pkg.description,
+        installed: installed.includes(pkg.serverId)
       }));
       console.log(JSON.stringify(result, null, 2));
       return;
@@ -25154,14 +25360,14 @@ var LspListCommand = {
     console.log(`
 \uD83D\uDCE6 LSP Servers
 `);
-    for (const pkg2 of LSP_PACKAGES2) {
-      const isInstalled = installed.includes(pkg2.serverId);
+    for (const pkg of LSP_PACKAGES2) {
+      const isInstalled = installed.includes(pkg.serverId);
       const status = isInstalled ? "✓" : "○";
       const installedText = isInstalled ? "installed" : "not installed";
-      console.log(`  ${status} ${pkg2.serverId.padEnd(12)} ${pkg2.description}`);
-      console.log(`    ${pkg2.npmPackage} - ${installedText}`);
+      console.log(`  ${status} ${pkg.serverId.padEnd(12)} ${pkg.description}`);
+      console.log(`    ${pkg.npmPackage} - ${installedText}`);
       if (argv.verbose && isInstalled) {
-        const verify = installer.verify(pkg2.serverId);
+        const verify = installer.verify(pkg.serverId);
         if (verify.binary) {
           console.log(`    Binary: ${verify.binary}`);
         }
@@ -25199,12 +25405,12 @@ var LspCheckCommand = {
       const servers2 = argv.serverId ? LSP_PACKAGES3.filter((p) => p.serverId === argv.serverId) : LSP_PACKAGES3;
       const result = {
         config: config.toJSON(),
-        servers: servers2.map((pkg2) => ({
-          serverId: pkg2.serverId,
-          npmPackage: pkg2.npmPackage,
-          description: pkg2.description,
-          installed: installer.isInstalled(pkg2.npmPackage),
-          verify: installer.verify(pkg2.serverId)
+        servers: servers2.map((pkg) => ({
+          serverId: pkg.serverId,
+          npmPackage: pkg.npmPackage,
+          description: pkg.description,
+          installed: installer.isInstalled(pkg.npmPackage),
+          verify: installer.verify(pkg.serverId)
         }))
       };
       console.log(JSON.stringify(result, null, 2));
@@ -25222,12 +25428,12 @@ var LspCheckCommand = {
 \uD83D\uDCE6 LSP Servers Status
 `);
     let hasIssues = false;
-    for (const pkg2 of servers) {
-      const verify = installer.verify(pkg2.serverId);
+    for (const pkg of servers) {
+      const verify = installer.verify(pkg.serverId);
       const installed = verify.installed ? "✓ Installed" : "✗ Not installed";
-      console.log(`  ${pkg2.serverId.padEnd(12)} ${pkg2.description}`);
+      console.log(`  ${pkg.serverId.padEnd(12)} ${pkg.description}`);
       console.log(`    ${installed}`);
-      console.log(`    Package: ${pkg2.npmPackage}`);
+      console.log(`    Package: ${pkg.npmPackage}`);
       if (verify.binary) {
         console.log(`    Binary in PATH: ${verify.binary}`);
       } else if (verify.installed) {
@@ -25302,11 +25508,11 @@ function readPackageInfo(packageName) {
     const localPkgPath = join5(packageName, "package.json");
     if (existsSync4(localPkgPath)) {
       try {
-        const pkg2 = JSON.parse(readFileSync3(localPkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync3(localPkgPath, "utf-8"));
         return {
-          version: pkg2.version ?? "0.0.0",
-          name: pkg2.name ?? packageName,
-          description: pkg2.description
+          version: pkg.version ?? "0.0.0",
+          name: pkg.name ?? packageName,
+          description: pkg.description
         };
       } catch (err) {
         console.warn(`⚠️  Failed to parse local package.json at '${localPkgPath}': ${err}`);
@@ -25326,11 +25532,11 @@ function readPackageInfo(packageName) {
   for (const pkgPath of searchPaths) {
     try {
       if (existsSync4(pkgPath)) {
-        const pkg2 = JSON.parse(readFileSync3(pkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
         return {
-          version: pkg2.version ?? "0.0.0",
-          name: pkg2.name ?? bareName,
-          description: pkg2.description
+          version: pkg.version ?? "0.0.0",
+          name: pkg.name ?? bareName,
+          description: pkg.description
         };
       }
     } catch (err) {
@@ -25669,9 +25875,9 @@ Examples:
   --plugin reminder                Enable iteration reminder
   --plugin tslsp code-check        Enable multiple plugins`;
 async function runCli() {
-  const pkg2 = await Promise.resolve().then(() => __toESM(require_package(), 1));
+  const version = getPackageVersion();
   const yargs = yargsLib;
-  await yargs(hideBin(process.argv)).scriptName("roy-agent").version(pkg2.default.version).option("quiet", {
+  await yargs(hideBin(process.argv)).scriptName("roy-agent").version(version).option("quiet", {
     describe: "Quiet mode (default: on, use --no-quiet to enable logging)",
     type: "boolean",
     default: true,