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

package/dist/bin/roy-agent.js

@@ -9461,7 +9461,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.17",
+  version: "1.7.18",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -12108,6 +12108,52 @@ async function shutdownInteractiveSteps(deps) {
   }
 }
 
+// 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";
 
@@ -13453,6 +13499,22 @@ function createInteractiveCommand(externalEnvService) {
             });
           }
         }, 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.*"],
@@ -13682,9 +13744,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,
@@ -13965,6 +14027,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?.();
@@ -13983,15 +14046,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;
@@ -14004,9 +14072,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);
@@ -14030,10 +14099,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;
@@ -14047,35 +14118,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);
@@ -14128,6 +14210,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;
@@ -14237,7 +14402,8 @@ async function loadHandleQuery(options, hooks) {
     eventSourceSystemPrompt,
     sessionComponent,
     eventHandler,
-    taskEventHandler
+    taskEventHandler,
+    sessionManager
   };
 }
 function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
@@ -14353,16 +14519,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();
@@ -14382,9 +14565,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);
       }
     }
@@ -14397,7 +14590,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";
@@ -14411,8 +14604,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;
@@ -14432,16 +14626,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);
       }

package/dist/index.js

@@ -9460,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.17",
+  version: "1.7.18",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -12107,6 +12107,52 @@ async function shutdownInteractiveSteps(deps) {
   }
 }
 
+// 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";
 
@@ -13452,6 +13498,22 @@ function createInteractiveCommand(externalEnvService) {
             });
           }
         }, 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.*"],
@@ -13681,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,
@@ -13964,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?.();
@@ -13982,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;
@@ -14003,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);
@@ -14029,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;
@@ -14046,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);
@@ -14127,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;
@@ -14236,7 +14401,8 @@ async function loadHandleQuery(options, hooks) {
     eventSourceSystemPrompt,
     sessionComponent,
     eventHandler,
-    taskEventHandler
+    taskEventHandler,
+    sessionManager
   };
 }
 function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
@@ -14352,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();
@@ -14381,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);
       }
     }
@@ -14396,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";
@@ -14410,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;
@@ -14431,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);
       }

package/package.json

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