@ai-setting/roy-agent-cli 1.7.16 → 1.7.18

package/dist/index.js

@@ -1677,7 +1677,7 @@ __export(exports_repl_ink, {
 });
 import * as React2 from "react";
 import { Box as Box3, Text as Text4, Static, useApp, useInput as useInput2 } from "ink";
-import { createLogger as createLogger4 } from "@ai-setting/roy-agent-core";
+import { createLogger as createLogger5 } from "@ai-setting/roy-agent-core";
 import { jsxDEV as jsxDEV4 } from "react/jsx-dev-runtime";
 function nextMessageId() {
   _msgIdCounter += 1;
@@ -2032,7 +2032,7 @@ var init_repl_ink = __esm(() => {
       children: out
     }, undefined, false, undefined, this);
   });
-  inkLogger = createLogger4("repl-ink");
+  inkLogger = createLogger5("repl-ink");
   MultilineInput = React2.memo(React2.forwardRef(function MultilineInput2(props, ref) {
     const { onSubmit, placeholder, popupActive, onChange, onEscape } = props;
     const [buffer, setBuffer] = React2.useState("");
@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.15",
+  version: "1.7.18",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -10380,6 +10380,8 @@ __legacyDecorateClassTS([
 import { ContextError as ContextError2, ErrorCodes as ErrorCodes2, getTracerProvider as getTracerProvider2 } from "@ai-setting/roy-agent-core";
 
 // src/commands/shared/task-event-handler.ts
+import { createLogger as createLogger4 } from "@ai-setting/roy-agent-core";
+var logger4 = createLogger4("task-event-handler");
 var TASK_EVENTS = {
   CREATED: "task.created",
   UPDATED: "task.updated",
@@ -10406,14 +10408,14 @@ class TaskEventHandler {
         this.handleEvent(event);
       }
     });
-    console.log("[TaskEventHandler] Started");
+    logger4.info("[TaskEventHandler] Started");
     return () => this.stop();
   }
   stop() {
     if (this.unsubscribe) {
       this.unsubscribe();
       this.unsubscribe = null;
-      console.log("[TaskEventHandler] Stopped");
+      logger4.info("[TaskEventHandler] Stopped");
     }
   }
   handleEvent(event) {
@@ -10438,47 +10440,47 @@ class TaskEventHandler {
         this.logTaskDelegated(payload);
         break;
       default:
-        console.log(`[${event.type}]`, payload);
+        logger4.info(`[${event.type}]`, payload);
     }
   }
   logTaskCreated(payload) {
     const task = payload.task;
-    console.log(`\uD83D\uDCDD Task created: #${task.id} - ${task.title}`);
-    console.log(`   Status: ${task.status}, Priority: ${task.priority}, Type: ${task.type || "normal"}`);
+    logger4.info(`\uD83D\uDCDD Task created: #${task.id} - ${task.title}`);
+    logger4.info(`   Status: ${task.status}, Priority: ${task.priority}, Type: ${task.type || "normal"}`);
     if (task.project_path) {
-      console.log(`   Project: ${task.project_path}`);
+      logger4.info(`   Project: ${task.project_path}`);
     }
     if (task.context) {
-      console.log(`   Context: ${task.context}`);
+      logger4.info(`   Context: ${task.context}`);
     }
   }
   logTaskUpdated(payload) {
     const task = payload.task;
     const changes = payload.changes;
-    console.log(`✏️  Task updated: #${task.id} - ${task.title}`);
-    console.log(`   Status: ${task.status}, Priority: ${task.priority}, Type: ${task.type || "normal"}, Progress: ${task.progress}%`);
+    logger4.info(`✏️  Task updated: #${task.id} - ${task.title}`);
+    logger4.info(`   Status: ${task.status}, Priority: ${task.priority}, Type: ${task.type || "normal"}, Progress: ${task.progress}%`);
     if (changes) {
-      console.log(`   Changes: ${JSON.stringify(changes)}`);
+      logger4.info(`   Changes: ${JSON.stringify(changes)}`);
     }
   }
   logTaskCompleted(payload) {
     const task = payload.task;
-    console.log(`✅ Task completed: #${task.id} - ${task.title}`);
-    console.log(`   Progress: ${task.progress}%, Updated: ${task.updatedAt}`);
+    logger4.info(`✅ Task completed: #${task.id} - ${task.title}`);
+    logger4.info(`   Progress: ${task.progress}%, Updated: ${task.updatedAt}`);
   }
   logTaskDeleted(payload) {
-    console.log(`\uD83D\uDDD1️  Task deleted: #${payload.taskId}`);
+    logger4.info(`\uD83D\uDDD1️  Task deleted: #${payload.taskId}`);
   }
   logOperationAdded(payload) {
     const op = payload.operation;
-    console.log(`\uD83D\uDCCB Operation added to task #${payload.taskId}:`);
-    console.log(`   [${op.milestoneType}] ${op.milestoneTitle}`);
-    console.log(`   Session: ${op.sessionId}`);
+    logger4.info(`\uD83D\uDCCB Operation added to task #${payload.taskId}:`);
+    logger4.info(`   [${op.milestoneType}] ${op.milestoneTitle}`);
+    logger4.info(`   Session: ${op.sessionId}`);
   }
   logTaskDelegated(payload) {
-    console.log(`\uD83D\uDE80 Task delegated: #${payload.taskId}`);
-    console.log(`   Background: ${payload.backgroundTaskId}, Type: ${payload.subagentType}`);
-    console.log(`   ${payload.description}`);
+    logger4.info(`\uD83D\uDE80 Task delegated: #${payload.taskId}`);
+    logger4.info(`   Background: ${payload.backgroundTaskId}, Type: ${payload.subagentType}`);
+    logger4.info(`   ${payload.description}`);
   }
 }
 
@@ -10556,9 +10558,9 @@ async function runActShutdownCleanup(deps) {
     envService,
     shouldDisposeEnvService,
     output,
-    logger: logger4
+    logger: logger5
   } = deps;
-  const log = logger4 ?? {
+  const log = logger5 ?? {
     debug: () => {},
     warn: (msg) => console.warn(msg)
   };
@@ -11702,7 +11704,7 @@ function hasActiveDescendants(env, parentSessionId) {
 
 // src/commands/interactive.ts
 init_stream_output_service();
-import { createLogger as createLogger5, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
+import { createLogger as createLogger6, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
 
 // src/commands/input-handler.ts
 class InputHandler {
@@ -12027,7 +12029,7 @@ async function shutdownInteractiveSteps(deps) {
     envService,
     shouldDisposeEnvService,
     output,
-    logger: logger4,
+    logger: logger5,
     console: consoleLike
   } = deps;
   const log = (msg) => consoleLike?.log?.(msg) ?? console.log(msg);
@@ -12040,7 +12042,7 @@ async function shutdownInteractiveSteps(deps) {
       await memoryPluginDispose();
       log("\uD83D\uDCBE 记忆已保存完毕");
     } catch (err) {
-      logger4.warn(`[Shutdown] MemoryPlugin dispose failed: ${err}`);
+      logger5.warn(`[Shutdown] MemoryPlugin dispose failed: ${err}`);
       output.warn(`⚠️ 记忆保存失败: ${err}`);
     }
   }
@@ -12048,25 +12050,25 @@ async function shutdownInteractiveSteps(deps) {
     try {
       await lspManagerDispose();
     } catch (err) {
-      logger4.warn(`[Shutdown] LSP Manager dispose failed: ${err}`);
+      logger5.warn(`[Shutdown] LSP Manager dispose failed: ${err}`);
     }
   }
   if (pluginAdapterDispose) {
     try {
       await pluginAdapterDispose();
     } catch (err) {
-      logger4.warn(`[Shutdown] PluginAdapter dispose failed: ${err}`);
+      logger5.warn(`[Shutdown] PluginAdapter dispose failed: ${err}`);
     }
   }
   try {
     eventHandler.stop();
   } catch (err) {
-    logger4.warn(`[Shutdown] EventHandler.stop failed: ${err}`);
+    logger5.warn(`[Shutdown] EventHandler.stop failed: ${err}`);
   }
   try {
     queryExecutor.dispose();
   } catch (err) {
-    logger4.warn(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
+    logger5.warn(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
   }
   try {
     const eventSourceComponent = env.getComponent("event-source");
@@ -12075,7 +12077,7 @@ async function shutdownInteractiveSteps(deps) {
       if (sources && sources.length > 0) {
         for (const source of sources) {
           const status = eventSourceComponent.getStatus?.(source.id);
-          logger4.debug(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
+          logger5.debug(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
           if (status !== "stopped" && status !== "created") {
             try {
               await eventSourceComponent.stopSource(source.id);
@@ -12088,23 +12090,69 @@ async function shutdownInteractiveSteps(deps) {
       }
     }
   } catch (err) {
-    logger4.warn(`[Shutdown] EventSource cleanup failed: ${err}`);
+    logger5.warn(`[Shutdown] EventSource cleanup failed: ${err}`);
   }
   if (shouldDisposeEnvService) {
     try {
       await envService.dispose();
     } catch (err) {
-      logger4.warn(`[Shutdown] envService.dispose failed: ${err}`);
+      logger5.warn(`[Shutdown] envService.dispose failed: ${err}`);
     }
   }
   try {
     await TempFileManager2.getInstance().cleanupAll();
-    logger4.debug("[Shutdown] TempFileManager cleaned up");
+    logger5.debug("[Shutdown] TempFileManager cleaned up");
   } catch (err) {
-    logger4.warn(`[Shutdown] TempFileManager cleanup failed: ${err}`);
+    logger5.warn(`[Shutdown] TempFileManager cleanup failed: ${err}`);
   }
 }
 
+// src/commands/lifecycle.ts
+var DEFAULT_LOGGER = {
+  warn: (msg) => console.error(`[shutdown] ${msg}`)
+};
+function registerShutdownHandlers(cleanup, options = {}) {
+  const logger5 = options.logger ?? DEFAULT_LOGGER;
+  const exitCode = options.exitCode ?? 0;
+  const shutdownMessage = options.shutdownMessage ?? "Cleaning up...";
+  let shuttingDown = false;
+  const shutdown = async (signal) => {
+    if (shuttingDown) {
+      return;
+    }
+    shuttingDown = true;
+    try {
+      logger5.debug?.(`[${signal}] ${shutdownMessage}`);
+    } catch {}
+    if (cleanup) {
+      try {
+        await cleanup();
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        try {
+          logger5.warn(`Cleanup failed: ${message}`);
+        } catch {
+          try {
+            process.stderr.write(`[shutdown] Cleanup failed: ${message}
+`);
+          } catch {}
+        }
+      }
+    }
+    try {
+      process.exit(exitCode);
+    } catch {}
+  };
+  process.on("SIGINT", shutdown);
+  process.on("SIGTERM", shutdown);
+  return {
+    dispose: () => {
+      process.removeListener("SIGINT", shutdown);
+      process.removeListener("SIGTERM", shutdown);
+    }
+  };
+}
+
 // src/commands/interactive.ts
 import { AskUserError, cascadeStopSessionTree } from "@ai-setting/roy-agent-core";
 
@@ -12291,7 +12339,7 @@ var COLOR_BY_STATUS = {
   busy: COLORS.accent
 };
 // src/commands/interactive.ts
-var logger4 = createLogger5("cli:interactive");
+var logger5 = createLogger6("cli:interactive");
 var USER_PROMPT = COLORS.accent("❯ ");
 
 class REPL {
@@ -12483,10 +12531,10 @@ ${COLORS.system("[正在中断...]")}`);
           const agentComponent = this.env.getComponent("agent");
           if (agentComponent?.abortAll) {
             agentComponent.abortAll();
-            logger4.debug("[/abort] AgentComponent.abortAll() called");
+            logger5.debug("[/abort] AgentComponent.abortAll() called");
           } else if (agentComponent?.abort) {
             agentComponent.abort("default");
-            logger4.debug("[/abort] AgentComponent.abort('default') called (fallback)");
+            logger5.debug("[/abort] AgentComponent.abort('default') called (fallback)");
           }
         }
         abortStream();
@@ -12581,7 +12629,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
               try {
                 await this.options.onAfterExecute(this.lastUsage);
               } catch (hookError) {
-                logger4.warn("onAfterExecute hook failed (ink path)", { error: String(hookError) });
+                logger5.warn("onAfterExecute hook failed (ink path)", { error: String(hookError) });
               }
             }
           } catch (err) {
@@ -12601,7 +12649,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
         await this.shutdown();
         resolve();
       }).catch(async (err) => {
-        logger4.error("ink REPL render failed", { error: String(err) });
+        logger5.error("ink REPL render failed", { error: String(err) });
         await this.shutdown();
         resolve();
       });
@@ -12658,7 +12706,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
       }
       if (key.name === "escape") {
         this.handleEscKey().catch((err) => {
-          logger4.warn(`[Esc] handleEscKey failed: ${err}`);
+          logger5.warn(`[Esc] handleEscKey failed: ${err}`);
         });
       }
     };
@@ -12853,7 +12901,7 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
         try {
           await this.options.onAfterExecute(this.lastUsage);
         } catch (hookError) {
-          logger4.warn("onAfterExecute hook failed", { error: String(hookError) });
+          logger5.warn("onAfterExecute hook failed", { error: String(hookError) });
         }
       }
     } catch (error) {
@@ -13016,12 +13064,12 @@ ${COLORS.error("❌ 执行失败: " + error)}
   }
   async handleEscKey() {
     if (this.isShuttingDown) {
-      logger4.debug("[Esc] handler entered (isShuttingDown=true) → early return");
+      logger5.debug("[Esc] handler entered (isShuttingDown=true) → early return");
       return;
     }
     const mainSessionIdEarly = this.options.sessionId;
     const hasActiveDescendant = mainSessionIdEarly ? hasActiveDescendants(this.env, mainSessionIdEarly) : false;
-    logger4.debug(`[Esc] handler entered: isExecuting=${this.isExecuting} hasActiveDescendant=${hasActiveDescendant} lastEscPressTime=${this.lastEscPressTime}`);
+    logger5.debug(`[Esc] handler entered: isExecuting=${this.isExecuting} hasActiveDescendant=${hasActiveDescendant} lastEscPressTime=${this.lastEscPressTime}`);
     const now = Date.now();
     const isExecuting = this.isExecuting;
     const canCascade = isExecuting || hasActiveDescendant;
@@ -13030,17 +13078,17 @@ ${COLORS.error("❌ 执行失败: " + error)}
       this.lastEscPressTime = now;
     }
     if (!canCascade) {
-      logger4.debug("[Esc] idle no-op: isExecuting=false, no active descendant");
+      logger5.debug("[Esc] idle no-op: isExecuting=false, no active descendant");
       return;
     }
     if (this.env) {
       const agentComponent = this.env.getComponent("agent");
       if (agentComponent?.abortAll) {
         agentComponent.abortAll();
-        logger4.debug("[Esc] AgentComponent.abortAll() called");
+        logger5.debug("[Esc] AgentComponent.abortAll() called");
       } else if (agentComponent?.abort) {
         agentComponent.abort("default");
-        logger4.debug("[Esc] AgentComponent.abort('default') called (fallback)");
+        logger5.debug("[Esc] AgentComponent.abort('default') called (fallback)");
       }
     }
     abortStream();
@@ -13048,7 +13096,7 @@ ${COLORS.error("❌ 执行失败: " + error)}
       try {
         this.inkApi.finishAssistantStream();
       } catch (err) {
-        logger4.warn("[Esc] finishAssistantStream failed", { error: String(err) });
+        logger5.warn("[Esc] finishAssistantStream failed", { error: String(err) });
       }
     }
     const mainSessionId = this.options.sessionId;
@@ -13061,9 +13109,9 @@ ${COLORS.error("❌ 执行失败: " + error)}
             timer = setTimeout(() => reject(new Error("cascade timeout 5s")), 5000);
           })
         ]);
-        logger4.info(`[Esc] cascade stop force=${result.force} tasks=${result.stoppedTaskIds.length} workflows=${result.stoppedWorkflowSessionIds.length} errors=${result.errors.length}`);
+        logger5.info(`[Esc] cascade stop force=${result.force} tasks=${result.stoppedTaskIds.length} workflows=${result.stoppedWorkflowSessionIds.length} errors=${result.errors.length}`);
       } catch (err) {
-        logger4.warn(`[Esc] cascade stop failed: ${err}`);
+        logger5.warn(`[Esc] cascade stop failed: ${err}`);
       } finally {
         if (timer !== undefined)
           clearTimeout(timer);
@@ -13445,11 +13493,27 @@ function createInteractiveCommand(externalEnvService) {
               envService,
               shouldDisposeEnvService,
               output,
-              logger: logger4,
+              logger: logger5,
               console
             });
           }
         }, env);
+        registerShutdownHandlers(async () => {
+          await shutdownInteractiveSteps({
+            memoryPluginDispose,
+            memoryPluginInstance,
+            lspManagerDispose,
+            pluginAdapterDispose,
+            eventHandler,
+            queryExecutor,
+            env,
+            envService,
+            shouldDisposeEnvService,
+            output,
+            logger: logger5,
+            console
+          });
+        });
         const eventHandler = new EventHandler({
           env,
           eventTypes: ["task.background.*", "event-source.event.*"],
@@ -13679,9 +13743,9 @@ var App = ({
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsxDEV6(Static2, {
         items: history,
-        children: (item) => /* @__PURE__ */ jsxDEV6(HistoryEntry, {
+        children: (item, index) => /* @__PURE__ */ jsxDEV6(HistoryEntry, {
           item
-        }, `${item.role}:${item.content}`, false, undefined, this)
+        }, item.id ?? `${item.role}:${index}`, false, undefined, this)
       }, undefined, false, undefined, this),
       status === "thinking" ? /* @__PURE__ */ jsxDEV6(Box4, {
         marginBottom: 1,
@@ -13962,6 +14026,7 @@ var RunScreen = ({
   const assistantTurnCountRef = useRef2(0);
   const isProcessingRef = useRef2(0);
   const executeQueryRef = useRef2(null);
+  const historyIdRef = useRef2(0);
   const width = process.stdout.columns ?? 80;
   const doExit = useCallback4(() => {
     onExit?.();
@@ -13980,15 +14045,20 @@ var RunScreen = ({
       const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
       const finalText = truncateForTerminal(rendered, maxLines);
       stream.finish();
-      setHistory((h) => [...h, { role: "assistant", content: finalText }]);
+      const assistantId = `h${++historyIdRef.current}`;
+      setHistory((h) => [
+        ...h,
+        { role: "assistant", content: finalText, id: assistantId }
+      ]);
       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);
+      const errorId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "tool", content: `❌ Error: ${msg}` }
+        { role: "tool", content: `❌ Error: ${msg}`, id: errorId }
       ]);
     } finally {
       isProcessingRef.current -= 1;
@@ -14001,9 +14071,10 @@ var RunScreen = ({
     if (!onRegisterHandlers)
       return;
     const handleNotification = async (message, _envEvent) => {
+      const notifId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "tool", content: `\uD83D\uDCE2 ${message}` }
+        { role: "tool", content: `\uD83D\uDCE2 ${message}`, id: notifId }
       ]);
       if (executeQueryRef.current) {
         await executeQueryRef.current(message);
@@ -14027,10 +14098,12 @@ var RunScreen = ({
     };
     const result = dispatchSlashCommand(trimmed, slashCtx);
     if (result.kind === "exit") {
+      const userId2 = `h${++historyIdRef.current}`;
+      const toolId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "user", content: trimmed },
-        { role: "tool", content: "\uD83D\uDC4B Goodbye!" }
+        { role: "user", content: trimmed, id: userId2 },
+        { role: "tool", content: "\uD83D\uDC4B Goodbye!", id: toolId }
       ]);
       doExit();
       return;
@@ -14044,35 +14117,46 @@ var RunScreen = ({
         setErrorMessage(null);
         return;
       }
+      const userId2 = `h${++historyIdRef.current}`;
+      const toolId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "user", content: trimmed },
-        { role: "tool", content: result.message }
+        { role: "user", content: trimmed, id: userId2 },
+        { role: "tool", content: result.message, id: toolId }
       ]);
       return;
     }
     if (result.kind === "unknown") {
+      const userId2 = `h${++historyIdRef.current}`;
+      const toolId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "user", content: trimmed },
-        { role: "tool", content: `⚠ ${result.message}` }
+        { role: "user", content: trimmed, id: userId2 },
+        { role: "tool", content: `⚠ ${result.message}`, id: toolId }
       ]);
       return;
     }
     if (result.kind === "set-max-lines") {
       setMaxLines(result.value);
+      const userId2 = `h${++historyIdRef.current}`;
+      const toolId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
-        { role: "user", content: trimmed },
+        { role: "user", content: trimmed, id: userId2 },
         {
           role: "tool",
-          content: `max-lines set to ${result.value}`
+          content: `max-lines set to ${result.value}`,
+          id: toolId
         }
       ]);
       return;
     }
     setErrorMessage(null);
-    setHistory((h) => [...h, { role: "user", content: trimmed }]);
+    const userId = `h${++historyIdRef.current}`;
+    setHistory((h) => [
+      ...h,
+      { role: "user", content: trimmed, id: userId }
+    ]);
     setUserHistory((uh) => [trimmed, ...uh]);
     userTurnCountRef.current += 1;
     await executeQuery(trimmed);
@@ -14125,6 +14209,89 @@ var RunTui_default = RunScreen;
 
 // src/commands/run.ts
 init_markdown();
+
+// src/commands/run-shutdown.ts
+import { TempFileManager as TempFileManager3 } from "@ai-setting/roy-agent-core/utils/temp-file-manager";
+async function shutdownRunSteps(deps) {
+  const {
+    lspManagerDispose,
+    pluginAdapterDispose,
+    stopEventHandler,
+    stopTaskEventHandler,
+    queryExecutor,
+    env,
+    envService,
+    shouldDisposeEnvService,
+    output,
+    logger: logger6
+  } = deps;
+  try {
+    stopEventHandler();
+  } catch (err) {
+    logger6?.warn?.(`[Shutdown] EventHandler.stop failed: ${err}`);
+  }
+  try {
+    stopTaskEventHandler();
+  } catch (err) {
+    logger6?.warn?.(`[Shutdown] TaskEventHandler.stop failed: ${err}`);
+  }
+  if (lspManagerDispose) {
+    try {
+      await lspManagerDispose();
+    } catch (err) {
+      logger6?.warn?.(`[Shutdown] LSP Manager dispose failed: ${err}`);
+    }
+  }
+  if (pluginAdapterDispose) {
+    try {
+      await pluginAdapterDispose();
+    } catch (err) {
+      logger6?.warn?.(`[Shutdown] PluginAdapter dispose failed: ${err}`);
+    }
+  }
+  try {
+    queryExecutor.dispose();
+  } catch (err) {
+    logger6?.warn?.(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
+  }
+  try {
+    const eventSourceComponent = env.getComponent("event-source");
+    if (eventSourceComponent) {
+      const sources = eventSourceComponent.list?.();
+      if (sources && sources.length > 0) {
+        for (const source of sources) {
+          const status = eventSourceComponent.getStatus?.(source.id);
+          logger6?.debug?.(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
+          if (status !== "stopped" && status !== "created") {
+            try {
+              await eventSourceComponent.stopSource(source.id);
+              output?.info?.(`✓ 已停止事件源: ${source.name} (${status})`);
+            } catch (error) {
+              output?.warn?.(`⚠️ 停止事件源 ${source.name} 失败: ${error}`);
+            }
+          }
+        }
+      }
+    }
+  } catch (err) {
+    logger6?.warn?.(`[Shutdown] EventSource cleanup failed: ${err}`);
+  }
+  if (shouldDisposeEnvService) {
+    try {
+      await envService.dispose();
+    } catch (err) {
+      logger6?.warn?.(`[Shutdown] envService.dispose failed: ${err}`);
+    }
+  }
+  try {
+    await TempFileManager3.getInstance().cleanupAll();
+    logger6?.debug?.("[Shutdown] TempFileManager cleaned up");
+  } catch (err) {
+    logger6?.warn?.(`[Shutdown] TempFileManager cleanup failed: ${err}`);
+  }
+}
+
+// src/commands/run.ts
 async function loadHandleQuery(options, hooks) {
   const quiet = CliQuietModeService.getInstance().isQuiet();
   const output = new OutputService2;
@@ -14234,7 +14401,8 @@ async function loadHandleQuery(options, hooks) {
     eventSourceSystemPrompt,
     sessionComponent,
     eventHandler,
-    taskEventHandler
+    taskEventHandler,
+    sessionManager
   };
 }
 function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
@@ -14350,16 +14518,33 @@ function createRunCommand() {
       };
       const {
         handleQuery,
+        envService,
+        env,
         queryExecutor,
         sessionId,
         agentContext,
         eventSourceSystemPrompt,
         eventHandler,
-        taskEventHandler
+        taskEventHandler,
+        sessionManager: _sessionManager
       } = await loadHandleQuery(argv, {
         isIdle: () => runState.isIdle(),
         onNotification: (msg, envEvent) => runState.onNotification(msg, envEvent)
       });
+      const shutdownHandle = registerShutdownHandlers(async () => {
+        await shutdownRunSteps({
+          lspManagerDispose: null,
+          pluginAdapterDispose: null,
+          stopEventHandler,
+          stopTaskEventHandler,
+          queryExecutor,
+          env,
+          envService,
+          shouldDisposeEnvService: true,
+          output: undefined,
+          logger: undefined
+        });
+      });
       const streamHandleQuery = createStreamHandleQuery(queryExecutor, sessionId, argv, agentContext, eventSourceSystemPrompt);
       const stopEventHandler = eventHandler.start();
       const stopTaskEventHandler = taskEventHandler.start();
@@ -14379,9 +14564,19 @@ function createRunCommand() {
       try {
         await waitUntilExit();
       } finally {
-        stopEventHandler();
-        stopTaskEventHandler();
-        queryExecutor.dispose();
+        shutdownHandle.dispose();
+        await shutdownRunSteps({
+          lspManagerDispose: null,
+          pluginAdapterDispose: null,
+          stopEventHandler,
+          stopTaskEventHandler,
+          queryExecutor,
+          env,
+          envService,
+          shouldDisposeEnvService: true,
+          output: undefined,
+          logger: undefined
+        });
         process.exit(0);
       }
     }
@@ -14394,7 +14589,7 @@ import React8 from "react";
 import { render as render2 } from "ink";
 
 // src/ChatTui.tsx
-import { useEffect as useEffect6, useState as useState7 } from "react";
+import { useEffect as useEffect6, useRef as useRef3, 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";
@@ -14408,8 +14603,9 @@ var ChatScreen = ({
   markdownEnabled: markdownEnabled2
 }) => {
   const [history, setHistory] = useState7([
-    { role: "user", content: message }
+    { role: "user", content: message, id: "h-init-1" }
   ]);
+  const historyIdRef = useRef3(1);
   const stream = useStreamingAccumulator();
   const { exit } = useApp3();
   const width = process.stdout.columns ?? 80;
@@ -14429,16 +14625,21 @@ var ChatScreen = ({
         stream.finish();
         const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
         const finalText = truncateForTerminal(rendered, maxLines);
-        setHistory((h) => [...h, { role: "assistant", content: finalText }]);
+        const assistantId = `h${++historyIdRef.current}`;
+        setHistory((h) => [
+          ...h,
+          { role: "assistant", content: finalText, id: assistantId }
+        ]);
         setTimeout(() => exit(), 100);
       } catch (err) {
         if (cancelled)
           return;
         const msg = err instanceof Error ? err.message : String(err);
         stream.fail(err instanceof Error ? err : new Error(msg));
+        const errorId = `h${++historyIdRef.current}`;
         setHistory((h) => [
           ...h,
-          { role: "tool", content: `❌ Error: ${msg}` }
+          { role: "tool", content: `❌ Error: ${msg}`, id: errorId }
         ]);
         setTimeout(() => exit(), 100);
       }
@@ -25492,24 +25693,106 @@ var LspCommand = {
 
 // src/commands/install/index.ts
 import { spawnSync } from "node:child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync, mkdirSync, rmSync } from "node:fs";
-import { join as join5, resolve } from "node:path";
+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";
+
+// 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 { 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")
+  ];
+  const backupRoot = options.backupDir ?? nodeTmpdir();
+  const result = {
+    cleaned: [],
+    skipped: [],
+    backups: []
+  };
+  if (!options.globalVersion) {
+    for (const p of paths) {
+      const candidate = join5(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)) {
+      result.skipped.push({ path: localPkgDir, reason: "no-local-copy" });
+      continue;
+    }
+    let localVersion = null;
+    try {
+      const pkg = JSON.parse(readFileSync3(localPkgJson, "utf-8"));
+      localVersion = typeof pkg.version === "string" ? pkg.version : null;
+    } catch {
+      localVersion = null;
+    }
+    const shouldClean = localVersion === null || compareVersions(localVersion, options.globalVersion) < 0;
+    if (!shouldClean) {
+      result.skipped.push({ path: localPkgDir, reason: "local-equal-or-newer" });
+      continue;
+    }
+    let backupPath = null;
+    try {
+      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}`);
+      cpSync(localPkgDir, backupPath, { recursive: true });
+      result.backups.push({ originalPath: localPkgDir, backupPath });
+    } catch (err) {
+      backupPath = null;
+      console.warn(`⚠️  Failed to backup stale copy at '${localPkgDir}': ${err}`);
+    }
+    try {
+      rmSync(localPkgDir, { recursive: true, force: true });
+      result.cleaned.push(localPkgDir);
+    } catch (err) {
+      console.warn(`⚠️  Failed to remove stale copy at '${localPkgDir}': ${err}`);
+      result.skipped.push({ path: localPkgDir, reason: "cleanup-failed" });
+      if (backupPath) {
+        console.warn(`   ↪ Backup preserved at '${backupPath}' for manual recovery`);
+      }
+    }
+  }
+  return result;
+}
+function compareVersions(a, b) {
+  const pa = a.split(".").map((s) => Number.parseInt(s, 10));
+  const pb = b.split(".").map((s) => Number.parseInt(s, 10));
+  for (let i = 0;i < 3; i++) {
+    const na = Number.isFinite(pa[i]) ? pa[i] : 0;
+    const nb = Number.isFinite(pb[i]) ? pb[i] : 0;
+    const diff = na - nb;
+    if (diff !== 0)
+      return diff;
+  }
+  return 0;
+}
+
+// src/commands/install/index.ts
 function getConfigDir(scope) {
-  return scope === "global" ? join5(homedir4(), ".roy-agent") : join5(process.cwd(), ".roy");
+  return scope === "global" ? join6(homedir4(), ".roy-agent") : join6(process.cwd(), ".roy");
 }
 function detectDefaultScope() {
-  const projectDir = join5(process.cwd(), ".roy");
-  return existsSync4(projectDir) ? "project" : "global";
+  const projectDir = join6(process.cwd(), ".roy");
+  return existsSync5(projectDir) ? "project" : "global";
 }
 function getConfigPath(scope) {
-  return join5(getConfigDir(scope), "plugins.json");
+  return join6(getConfigDir(scope), "plugins.json");
 }
 function loadPlugins(scope) {
   const configPath = getConfigPath(scope);
   try {
-    if (existsSync4(configPath)) {
-      const raw = readFileSync3(configPath, "utf-8");
+    if (existsSync5(configPath)) {
+      const raw = readFileSync4(configPath, "utf-8");
       const config = JSON.parse(raw);
       return config.plugins ?? [];
     }
@@ -25519,7 +25802,7 @@ function loadPlugins(scope) {
 function savePlugins(plugins, scope) {
   const configDir = getConfigDir(scope);
   const configPath = getConfigPath(scope);
-  if (!existsSync4(configDir)) {
+  if (!existsSync5(configDir)) {
     mkdirSync(configDir, { recursive: true });
   }
   const config = { plugins };
@@ -25535,10 +25818,10 @@ function stripVersionSpec(packageName) {
 function readPackageInfo(packageName) {
   const bareName = packageName.startsWith("/") || packageName.startsWith(".") ? packageName : stripVersionSpec(packageName);
   if (packageName.startsWith("/") || packageName.startsWith(".")) {
-    const localPkgPath = join5(packageName, "package.json");
-    if (existsSync4(localPkgPath)) {
+    const localPkgPath = join6(packageName, "package.json");
+    if (existsSync5(localPkgPath)) {
       try {
-        const pkg = JSON.parse(readFileSync3(localPkgPath, "utf-8"));
+        const pkg = JSON.parse(readFileSync4(localPkgPath, "utf-8"));
         return {
           version: pkg.version ?? "0.0.0",
           name: pkg.name ?? packageName,
@@ -25550,19 +25833,19 @@ function readPackageInfo(packageName) {
     }
   }
   const searchPaths = [
-    join5(process.cwd(), "node_modules", bareName, "package.json"),
+    join6(process.cwd(), "node_modules", bareName, "package.json"),
     resolve(process.cwd(), "..", "node_modules", bareName, "package.json"),
-    join5(process.cwd(), ".roy", "plugins", bareName, "package.json"),
+    join6(process.cwd(), ".roy", "plugins", bareName, "package.json"),
     ...(() => {
       const globalRoot = getNpmGlobalRoot();
-      return globalRoot ? [join5(globalRoot, bareName, "package.json")] : [];
+      return globalRoot ? [join6(globalRoot, bareName, "package.json")] : [];
     })(),
-    join5(homedir4(), ".roy-agent", "node_modules", bareName, "package.json")
+    join6(homedir4(), ".roy-agent", "node_modules", bareName, "package.json")
   ];
   for (const pkgPath of searchPaths) {
     try {
-      if (existsSync4(pkgPath)) {
-        const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
+      if (existsSync5(pkgPath)) {
+        const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
         return {
           version: pkg.version ?? "0.0.0",
           name: pkg.name ?? bareName,
@@ -25584,19 +25867,6 @@ function getNpmGlobalRoot() {
   }
   return null;
 }
-function cleanupStaleCpCopy(packageName) {
-  const cpDir = join5(homedir4(), ".roy-agent", "node_modules", packageName);
-  if (!existsSync4(cpDir)) {
-    return false;
-  }
-  try {
-    rmSync(cpDir, { recursive: true, force: true });
-    return true;
-  } catch (err) {
-    console.warn(`⚠️  Failed to clean stale cp copy at '${cpDir}': ${err}`);
-    return false;
-  }
-}
 async function verifyInstalledVersion(packageName, declaredVersion) {
   const actual = readPackageInfo(packageName);
   if (!actual || !actual.version) {
@@ -25608,15 +25878,15 @@ async function verifyInstalledVersion(packageName, declaredVersion) {
   return { ok: true, actualVersion: actual.version };
 }
 function getPackageManagerCommand() {
-  if (existsSync4(join5(process.cwd(), "pnpm-lock.yaml"))) {
-    if (existsSync4(join5(process.cwd(), "pnpm-workspace.yaml"))) {
+  if (existsSync5(join6(process.cwd(), "pnpm-lock.yaml"))) {
+    if (existsSync5(join6(process.cwd(), "pnpm-workspace.yaml"))) {
       return "pnpm -w";
     }
     return "pnpm";
   }
-  if (existsSync4(join5(process.cwd(), "yarn.lock")))
+  if (existsSync5(join6(process.cwd(), "yarn.lock")))
     return "yarn";
-  if (existsSync4(join5(process.cwd(), "bun.lock")) || existsSync4(join5(process.cwd(), "bun.lockb")))
+  if (existsSync5(join6(process.cwd(), "bun.lock")) || existsSync5(join6(process.cwd(), "bun.lockb")))
     return "bun";
   return "npm";
 }
@@ -25655,14 +25925,14 @@ var InstallPackageCommand = {
         }
         resolvedName = info2.name;
         const srcDir = resolve(packageName);
-        if (!existsSync4(srcDir)) {
+        if (!existsSync5(srcDir)) {
           console.error(`
 ❌ Local path '${srcDir}' does not exist.
 `);
           process.exit(1);
         }
-        const pluginDir = join5(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync4(pluginDir)) {
+        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync5(pluginDir)) {
           mkdirSync(pluginDir, { recursive: true });
         }
         const result = spawnSync("cp", ["-r", `${srcDir}/.`, pluginDir], {
@@ -25697,12 +25967,12 @@ var InstallPackageCommand = {
           process.exit(1);
         }
         resolvedName = info2.name;
-        const pluginDir = join5(process.cwd(), ".roy", "plugins", resolvedName);
-        if (!existsSync4(pluginDir)) {
+        const pluginDir = join6(process.cwd(), ".roy", "plugins", resolvedName);
+        if (!existsSync5(pluginDir)) {
           mkdirSync(pluginDir, { recursive: true });
         }
-        const nmPath = join5(process.cwd(), "node_modules", packageName);
-        if (existsSync4(nmPath)) {
+        const nmPath = join6(process.cwd(), "node_modules", packageName);
+        if (existsSync5(nmPath)) {
           spawnSync("cp", ["-r", `${nmPath}/.`, pluginDir], { stdio: "inherit", shell: false });
         }
       }
@@ -25722,11 +25992,24 @@ var InstallPackageCommand = {
       }
       const tmpInfo = readPackageInfo(packageName);
       if (tmpInfo) {
-        const cleaned = cleanupStaleCpCopy(tmpInfo.name);
-        if (cleaned) {
+        const cleanupResult = cleanupStalePluginCopies(tmpInfo.name, {
+          globalVersion: tmpInfo.version,
+          homedir: homedir4()
+        });
+        if (cleanupResult.cleaned.length > 0) {
           console.log(`
-\uD83E\uDDF9 Cleaned stale cp copy: ~/.roy-agent/node_modules/${tmpInfo.name}
-`);
+\uD83E\uDDF9 Cleaned stale plugin copies:`);
+          for (const path9 of cleanupResult.cleaned) {
+            console.log(`   - ${path9}`);
+          }
+          if (cleanupResult.backups.length > 0) {
+            console.log(`
+\uD83D\uDCE6 Backups (for manual recovery):`);
+            for (const b of cleanupResult.backups) {
+              console.log(`   ${b.originalPath} → ${b.backupPath}`);
+            }
+          }
+          console.log();
         }
       }
     }
@@ -25851,8 +26134,8 @@ var InstallRemoveCommand = {
 \uD83D\uDDD1️  Removing plugin: ${plugin.packageName}@${plugin.version} (${scope})
 `);
     if (scope === "project") {
-      const pluginDir = join5(process.cwd(), ".roy", "plugins", plugin.packageName);
-      if (existsSync4(pluginDir)) {
+      const pluginDir = join6(process.cwd(), ".roy", "plugins", plugin.packageName);
+      if (existsSync5(pluginDir)) {
         spawnSync("rm", ["-rf", pluginDir], { stdio: "inherit", shell: false });
         console.log(`  Removed plugin directory: ${pluginDir}`);
       }
@@ -25867,8 +26150,8 @@ var InstallRemoveCommand = {
 `);
         process.exit(result.status ?? 1);
       }
-      const globalNm = join5(homedir4(), ".roy-agent", "node_modules", plugin.packageName);
-      if (existsSync4(globalNm)) {
+      const globalNm = join6(homedir4(), ".roy-agent", "node_modules", plugin.packageName);
+      if (existsSync5(globalNm)) {
         spawnSync("rm", ["-rf", globalNm], { stdio: "inherit", shell: false });
       }
     }