@robota-sdk/agent-cli 3.0.0-beta.35 → 3.0.0-beta.36

package/dist/node/bin.cjs

@@ -168,7 +168,8 @@ var import_ink14 = require("ink");
 // src/ui/App.tsx
 var import_react16 = require("react");
 var import_ink13 = require("ink");
-var import_agent_core3 = require("@robota-sdk/agent-core");
+var import_agent_core6 = require("@robota-sdk/agent-core");
+var import_agent_core7 = require("@robota-sdk/agent-core");
 
 // src/ui/hooks/useSession.ts
 var import_react = require("react");
@@ -264,6 +265,7 @@ var NOOP_TERMINAL = {
 function useSession(props) {
   const [permissionRequest, setPermissionRequest] = (0, import_react.useState)(null);
   const [streamingText, setStreamingText] = (0, import_react.useState)("");
+  const streamingTextRef = (0, import_react.useRef)("");
   const [activeTools, setActiveTools] = (0, import_react.useState)([]);
   const permissionQueueRef = (0, import_react.useRef)([]);
   const processingRef = (0, import_react.useRef)(false);
@@ -295,8 +297,15 @@ function useSession(props) {
         processNextPermission();
       });
     };
+    let flushTimer = null;
     const onTextDelta = (delta) => {
-      setStreamingText((prev) => prev + delta);
+      streamingTextRef.current += delta;
+      if (!flushTimer) {
+        flushTimer = setTimeout(() => {
+          setStreamingText(streamingTextRef.current);
+          flushTimer = null;
+        }, 16);
+      }
     };
     const onToolExecution = (event) => {
       if (event.type === "start") {
@@ -375,6 +384,7 @@ function useSession(props) {
   }
   const clearStreamingText = (0, import_react.useCallback)(() => {
     setStreamingText("");
+    streamingTextRef.current = "";
     setActiveTools([]);
   }, []);
   return {
@@ -389,16 +399,11 @@ function useSession(props) {
 // src/ui/hooks/useMessages.ts
 var import_react2 = require("react");
 var MAX_RENDERED_MESSAGES = 100;
-var msgIdCounter = 0;
-function nextId() {
-  msgIdCounter += 1;
-  return `msg_${msgIdCounter}`;
-}
 function useMessages() {
   const [messages, setMessages] = (0, import_react2.useState)([]);
   const addMessage = (0, import_react2.useCallback)((msg) => {
     setMessages((prev) => {
-      const updated = [...prev, { ...msg, id: nextId(), timestamp: /* @__PURE__ */ new Date() }];
+      const updated = [...prev, msg];
       if (updated.length > MAX_RENDERED_MESSAGES) {
         return updated.slice(-MAX_RENDERED_MESSAGES);
       }
@@ -410,6 +415,7 @@ function useMessages() {
 
 // src/ui/hooks/useSlashCommands.ts
 var import_react3 = require("react");
+var import_agent_core = require("@robota-sdk/agent-core");
 
 // src/commands/slash-executor.ts
 var VALID_MODES2 = ["plan", "default", "acceptEdits", "bypassPermissions"];
@@ -676,11 +682,14 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
       const cmd = parts[0]?.toLowerCase() ?? "";
       const args = parts.slice(1).join(" ");
       const clearMessages = () => setMessages([]);
+      const slashAddMessage = (msg) => {
+        addMessage((0, import_agent_core.createSystemMessage)(msg.content));
+      };
       const result = await executeSlashCommand(
         cmd,
         args,
         session,
-        addMessage,
+        slashAddMessage,
         clearMessages,
         registry,
         pluginCallbacks
@@ -713,7 +722,9 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
 
 // src/ui/hooks/useSubmitHandler.ts
 var import_react4 = require("react");
+var import_node_crypto = require("crypto");
 var import_agent_sdk2 = require("@robota-sdk/agent-sdk");
+var import_agent_core2 = require("@robota-sdk/agent-core");
 
 // src/utils/tool-call-extractor.ts
 var TOOL_ARG_MAX_LENGTH = 80;
@@ -870,21 +881,50 @@ async function runSessionPrompt(prompt, session, addMessage, clearStreamingText,
       historyBefore
     );
     if (toolSummaries.length > 0) {
-      addMessage({
-        role: "tool",
-        content: JSON.stringify(toolSummaries),
-        toolName: `${toolSummaries.length} tools`
-      });
+      addMessage(
+        (0, import_agent_core2.createToolMessage)(JSON.stringify(toolSummaries), {
+          toolCallId: (0, import_node_crypto.randomUUID)(),
+          name: `${toolSummaries.length} tools`
+        })
+      );
     }
-    addMessage({ role: "assistant", content: response || "(empty response)" });
+    addMessage((0, import_agent_core2.createAssistantMessage)(response || "(empty response)"));
     syncContextState(session, setContextState);
   } catch (err) {
     clearStreamingText();
-    if (err instanceof DOMException && err.name === "AbortError") {
-      addMessage({ role: "system", content: "Cancelled." });
+    const isAbortError = err instanceof DOMException && err.name === "AbortError" || err instanceof Error && (err.message.includes("aborted") || err.message.includes("abort"));
+    if (isAbortError) {
+      const history = session.getHistory();
+      const toolSummaries = extractToolCallsWithDiff(
+        history,
+        historyBefore
+      );
+      if (toolSummaries.length > 0) {
+        addMessage(
+          (0, import_agent_core2.createToolMessage)(JSON.stringify(toolSummaries), {
+            toolCallId: (0, import_node_crypto.randomUUID)(),
+            name: `${toolSummaries.length} tools`
+          })
+        );
+      }
+      const assistantParts = [];
+      let lastAssistantState = "complete";
+      for (let i = historyBefore; i < history.length; i++) {
+        const msg = history[i];
+        if (msg && msg.role === "assistant" && msg.content) {
+          assistantParts.push(msg.content);
+          if (msg.state === "interrupted") lastAssistantState = "interrupted";
+        }
+      }
+      if (assistantParts.length > 0) {
+        addMessage(
+          (0, import_agent_core2.createAssistantMessage)(assistantParts.join("\n\n"), { state: lastAssistantState })
+        );
+      }
+      addMessage((0, import_agent_core2.createSystemMessage)("Interrupted by user."));
     } else {
       const errMsg = err instanceof Error ? err.message : String(err);
-      addMessage({ role: "system", content: `Error: ${errMsg}` });
+      addMessage((0, import_agent_core2.createSystemMessage)(`Error: ${errMsg}`));
     }
   } finally {
     setIsThinking(false);
@@ -937,7 +977,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           const runInFork = createForkRunner(session);
           const result = await executeSkill(skill, args, { runInFork });
           if (result.mode === "fork") {
-            addMessage({ role: "assistant", content: result.result ?? "(empty response)" });
+            addMessage((0, import_agent_core2.createAssistantMessage)(result.result ?? "(empty response)"));
             syncContextState(session, setContextState);
             return;
           }
@@ -972,7 +1012,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           hookInput
         );
       }
-      addMessage({ role: "user", content: input });
+      addMessage((0, import_agent_core2.createUserMessage)(input));
       return runSessionPrompt(
         input,
         session,
@@ -1039,16 +1079,16 @@ var CommandRegistry = class {
 };
 
 // src/commands/builtin-source.ts
-var import_agent_core = require("@robota-sdk/agent-core");
+var import_agent_core3 = require("@robota-sdk/agent-core");
 function buildModelSubcommands() {
   const seen = /* @__PURE__ */ new Set();
   const commands = [];
-  for (const model of Object.values(import_agent_core.CLAUDE_MODELS)) {
+  for (const model of Object.values(import_agent_core3.CLAUDE_MODELS)) {
     if (seen.has(model.name)) continue;
     seen.add(model.name);
     commands.push({
       name: model.id,
-      description: `${model.name} (${(0, import_agent_core.formatTokenCount)(model.contextWindow).toUpperCase()})`,
+      description: `${model.name} (${(0, import_agent_core3.formatTokenCount)(model.contextWindow).toUpperCase()})`,
       source: "builtin"
     });
   }
@@ -1443,6 +1483,7 @@ function usePluginCallbacks(cwd) {
 // src/ui/MessageList.tsx
 var import_react7 = __toESM(require("react"), 1);
 var import_ink2 = require("ink");
+var import_agent_core4 = require("@robota-sdk/agent-core");
 
 // src/ui/render-markdown.ts
 var import_marked = require("marked");
@@ -1528,9 +1569,14 @@ function RoleLabel({ role }) {
   }
 }
 function ToolMessage({ message }) {
+  if (!(0, import_agent_core4.isToolMessage)(message)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, {});
+  }
+  const toolName = message.name;
+  const content = message.content;
   let summaries = null;
   try {
-    const parsed = JSON.parse(message.content);
+    const parsed = JSON.parse(content);
     if (Array.isArray(parsed) && parsed.length > 0 && typeof parsed[0].line === "string") {
       summaries = parsed;
     }
@@ -1543,9 +1589,9 @@ function ToolMessage({ message }) {
           "Tool:",
           " "
         ] }),
-        message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
+        toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
           "[",
-          message.toolName,
+          toolName,
           "]"
         ] })
       ] }),
@@ -1561,16 +1607,16 @@ function ToolMessage({ message }) {
       ] }, i))
     ] });
   }
-  const lines = message.content.split("\n").filter((l) => l.trim());
+  const lines = content.split("\n").filter((l) => l.trim());
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", bold: true, children: [
         "Tool:",
         " "
       ] }),
-      message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
+      toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
         "[",
-        message.toolName,
+        toolName,
         "]"
       ] })
     ] }),
@@ -1586,21 +1632,15 @@ function ToolMessage({ message }) {
 var MessageItem = import_react7.default.memo(function MessageItem2({
   message
 }) {
-  if (message.role === "tool") {
+  if ((0, import_agent_core4.isToolMessage)(message)) {
     return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ToolMessage, { message });
   }
+  const content = message.content ?? "";
+  const isInterrupted = message.state === "interrupted";
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RoleLabel, { role: message.role }),
-      message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "magenta", dimColor: true, children: [
-        "[",
-        message.toolName,
-        "]",
-        " "
-      ] })
-    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RoleLabel, { role: message.role }) }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { children: " " }),
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { wrap: "wrap", children: message.role === "assistant" ? renderMarkdown(message.content) : message.content }) })
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { wrap: "wrap", children: (0, import_agent_core4.isAssistantMessage)(message) ? renderMarkdown(content + (isInterrupted ? "\n\n_(interrupted)_" : "")) : content }) })
   ] });
 });
 function MessageList({ messages }) {
@@ -1609,7 +1649,7 @@ function MessageList({ messages }) {
 
 // src/ui/StatusBar.tsx
 var import_ink3 = require("ink");
-var import_agent_core2 = require("@robota-sdk/agent-core");
+var import_agent_core5 = require("@robota-sdk/agent-core");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 var CONTEXT_YELLOW_THRESHOLD = 70;
 var CONTEXT_RED_THRESHOLD = 90;
@@ -1649,9 +1689,9 @@ function StatusBar({
             "Context: ",
             Math.round(contextPercentage),
             "% (",
-            (0, import_agent_core2.formatTokenCount)(contextUsedTokens),
+            (0, import_agent_core5.formatTokenCount)(contextUsedTokens),
             "/",
-            (0, import_agent_core2.formatTokenCount)(contextMaxTokens),
+            (0, import_agent_core5.formatTokenCount)(contextMaxTokens),
             ")"
           ] })
         ] }),
@@ -1979,7 +2019,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
         isSubcommandMode
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Box, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response..." }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Box, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "green", bold: true, children: "> " }),
       /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
         CjkTextInput,
@@ -2115,7 +2155,7 @@ function StreamingIndicator({ text, activeTools }) {
   const hasTools = activeTools.length > 0;
   const hasText = text.length > 0;
   if (!hasTools && !hasText) {
-    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_ink10.Text, { color: "yellow", children: "Thinking..." });
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_jsx_runtime10.Fragment, {});
   }
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", children: [
     hasTools && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", marginBottom: 1, children: [
@@ -2689,7 +2729,7 @@ function App(props) {
     pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       ConfirmPrompt,
       {
-        message: `Change model to ${(0, import_agent_core3.getModelName)(pendingModelId)}? This will restart the session.`,
+        message: `Change model to ${(0, import_agent_core6.getModelName)(pendingModelId)}? This will restart the session.`,
         onSelect: (index) => {
           setPendingModelId(null);
           pendingModelChangeRef.current = null;
@@ -2697,19 +2737,21 @@ function App(props) {
             try {
               const settingsPath = getUserSettingsPath();
               updateModelInSettings(settingsPath, pendingModelId);
-              addMessage({
-                role: "system",
-                content: `Model changed to ${(0, import_agent_core3.getModelName)(pendingModelId)}. Restarting...`
-              });
+              addMessage(
+                (0, import_agent_core7.createSystemMessage)(
+                  `Model changed to ${(0, import_agent_core6.getModelName)(pendingModelId)}. Restarting...`
+                )
+              );
               setTimeout(() => exit(), EXIT_DELAY_MS2);
             } catch (err) {
-              addMessage({
-                role: "system",
-                content: `Failed: ${err instanceof Error ? err.message : String(err)}`
-              });
+              addMessage(
+                (0, import_agent_core7.createSystemMessage)(
+                  `Failed: ${err instanceof Error ? err.message : String(err)}`
+                )
+              );
             }
           } else {
-            addMessage({ role: "system", content: "Model change cancelled." });
+            addMessage((0, import_agent_core7.createSystemMessage)("Model change cancelled."));
           }
         }
       }
@@ -2719,14 +2761,14 @@ function App(props) {
       {
         callbacks: pluginCallbacks,
         onClose: () => setShowPluginTUI(false),
-        addMessage: (msg) => addMessage(msg)
+        addMessage: (msg) => addMessage((0, import_agent_core7.createSystemMessage)(msg.content))
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       StatusBar,
       {
         permissionMode: session.getPermissionMode(),
-        modelName: (0, import_agent_core3.getModelName)(props.config.provider.model),
+        modelName: (0, import_agent_core6.getModelName)(props.config.provider.model),
         sessionId: session.getSessionId(),
         messageCount: messages.length,
         isThinking,

package/dist/node/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   startCli
-} from "./chunk-27OPEZHA.js";
+} from "./chunk-ERF646KY.js";
 
 // src/bin.ts
 process.on("uncaughtException", (err) => {

package/dist/node/{chunk-27OPEZHA.js → chunk-ERF646KY.js}

@@ -152,6 +152,7 @@ import { render } from "ink";
 import { useState as useState10, useRef as useRef8 } from "react";
 import { Box as Box11, Text as Text13, useApp, useInput as useInput7 } from "ink";
 import { getModelName } from "@robota-sdk/agent-core";
+import { createSystemMessage as createSystemMessage3 } from "@robota-sdk/agent-core";
 
 // src/ui/hooks/useSession.ts
 import { useState, useCallback, useRef } from "react";
@@ -247,6 +248,7 @@ var NOOP_TERMINAL = {
 function useSession(props) {
   const [permissionRequest, setPermissionRequest] = useState(null);
   const [streamingText, setStreamingText] = useState("");
+  const streamingTextRef = useRef("");
   const [activeTools, setActiveTools] = useState([]);
   const permissionQueueRef = useRef([]);
   const processingRef = useRef(false);
@@ -278,8 +280,15 @@ function useSession(props) {
         processNextPermission();
       });
     };
+    let flushTimer = null;
     const onTextDelta = (delta) => {
-      setStreamingText((prev) => prev + delta);
+      streamingTextRef.current += delta;
+      if (!flushTimer) {
+        flushTimer = setTimeout(() => {
+          setStreamingText(streamingTextRef.current);
+          flushTimer = null;
+        }, 16);
+      }
     };
     const onToolExecution = (event) => {
       if (event.type === "start") {
@@ -358,6 +367,7 @@ function useSession(props) {
   }
   const clearStreamingText = useCallback(() => {
     setStreamingText("");
+    streamingTextRef.current = "";
     setActiveTools([]);
   }, []);
   return {
@@ -372,16 +382,11 @@ function useSession(props) {
 // src/ui/hooks/useMessages.ts
 import { useState as useState2, useCallback as useCallback2 } from "react";
 var MAX_RENDERED_MESSAGES = 100;
-var msgIdCounter = 0;
-function nextId() {
-  msgIdCounter += 1;
-  return `msg_${msgIdCounter}`;
-}
 function useMessages() {
   const [messages, setMessages] = useState2([]);
   const addMessage = useCallback2((msg) => {
     setMessages((prev) => {
-      const updated = [...prev, { ...msg, id: nextId(), timestamp: /* @__PURE__ */ new Date() }];
+      const updated = [...prev, msg];
       if (updated.length > MAX_RENDERED_MESSAGES) {
         return updated.slice(-MAX_RENDERED_MESSAGES);
       }
@@ -393,6 +398,7 @@ function useMessages() {
 
 // src/ui/hooks/useSlashCommands.ts
 import { useCallback as useCallback3 } from "react";
+import { createSystemMessage } from "@robota-sdk/agent-core";
 
 // src/commands/slash-executor.ts
 var VALID_MODES2 = ["plan", "default", "acceptEdits", "bypassPermissions"];
@@ -659,11 +665,14 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
       const cmd = parts[0]?.toLowerCase() ?? "";
       const args = parts.slice(1).join(" ");
       const clearMessages = () => setMessages([]);
+      const slashAddMessage = (msg) => {
+        addMessage(createSystemMessage(msg.content));
+      };
       const result = await executeSlashCommand(
         cmd,
         args,
         session,
-        addMessage,
+        slashAddMessage,
         clearMessages,
         registry,
         pluginCallbacks
@@ -696,11 +705,18 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
 
 // src/ui/hooks/useSubmitHandler.ts
 import { useCallback as useCallback4 } from "react";
+import { randomUUID } from "crypto";
 import {
   createSubagentSession,
   getBuiltInAgent,
   retrieveAgentToolDeps
 } from "@robota-sdk/agent-sdk";
+import {
+  createUserMessage,
+  createAssistantMessage,
+  createSystemMessage as createSystemMessage2,
+  createToolMessage
+} from "@robota-sdk/agent-core";
 
 // src/utils/tool-call-extractor.ts
 var TOOL_ARG_MAX_LENGTH = 80;
@@ -857,21 +873,50 @@ async function runSessionPrompt(prompt, session, addMessage, clearStreamingText,
       historyBefore
     );
     if (toolSummaries.length > 0) {
-      addMessage({
-        role: "tool",
-        content: JSON.stringify(toolSummaries),
-        toolName: `${toolSummaries.length} tools`
-      });
+      addMessage(
+        createToolMessage(JSON.stringify(toolSummaries), {
+          toolCallId: randomUUID(),
+          name: `${toolSummaries.length} tools`
+        })
+      );
     }
-    addMessage({ role: "assistant", content: response || "(empty response)" });
+    addMessage(createAssistantMessage(response || "(empty response)"));
     syncContextState(session, setContextState);
   } catch (err) {
     clearStreamingText();
-    if (err instanceof DOMException && err.name === "AbortError") {
-      addMessage({ role: "system", content: "Cancelled." });
+    const isAbortError = err instanceof DOMException && err.name === "AbortError" || err instanceof Error && (err.message.includes("aborted") || err.message.includes("abort"));
+    if (isAbortError) {
+      const history = session.getHistory();
+      const toolSummaries = extractToolCallsWithDiff(
+        history,
+        historyBefore
+      );
+      if (toolSummaries.length > 0) {
+        addMessage(
+          createToolMessage(JSON.stringify(toolSummaries), {
+            toolCallId: randomUUID(),
+            name: `${toolSummaries.length} tools`
+          })
+        );
+      }
+      const assistantParts = [];
+      let lastAssistantState = "complete";
+      for (let i = historyBefore; i < history.length; i++) {
+        const msg = history[i];
+        if (msg && msg.role === "assistant" && msg.content) {
+          assistantParts.push(msg.content);
+          if (msg.state === "interrupted") lastAssistantState = "interrupted";
+        }
+      }
+      if (assistantParts.length > 0) {
+        addMessage(
+          createAssistantMessage(assistantParts.join("\n\n"), { state: lastAssistantState })
+        );
+      }
+      addMessage(createSystemMessage2("Interrupted by user."));
     } else {
       const errMsg = err instanceof Error ? err.message : String(err);
-      addMessage({ role: "system", content: `Error: ${errMsg}` });
+      addMessage(createSystemMessage2(`Error: ${errMsg}`));
     }
   } finally {
     setIsThinking(false);
@@ -924,7 +969,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           const runInFork = createForkRunner(session);
           const result = await executeSkill(skill, args, { runInFork });
           if (result.mode === "fork") {
-            addMessage({ role: "assistant", content: result.result ?? "(empty response)" });
+            addMessage(createAssistantMessage(result.result ?? "(empty response)"));
             syncContextState(session, setContextState);
             return;
           }
@@ -959,7 +1004,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           hookInput
         );
       }
-      addMessage({ role: "user", content: input });
+      addMessage(createUserMessage(input));
       return runSessionPrompt(
         input,
         session,
@@ -1435,6 +1480,7 @@ function usePluginCallbacks(cwd) {
 // src/ui/MessageList.tsx
 import React2 from "react";
 import { Box as Box2, Text as Text2 } from "ink";
+import { isToolMessage, isAssistantMessage } from "@robota-sdk/agent-core";
 
 // src/ui/render-markdown.ts
 import { marked } from "marked";
@@ -1494,7 +1540,7 @@ function DiffBlock({ file, lines }) {
 }
 
 // src/ui/MessageList.tsx
-import { jsx, jsxs as jsxs2 } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs as jsxs2 } from "react/jsx-runtime";
 function RoleLabel({ role }) {
   switch (role) {
     case "user":
@@ -1520,9 +1566,14 @@ function RoleLabel({ role }) {
   }
 }
 function ToolMessage({ message }) {
+  if (!isToolMessage(message)) {
+    return /* @__PURE__ */ jsx(Fragment, {});
+  }
+  const toolName = message.name;
+  const content = message.content;
   let summaries = null;
   try {
-    const parsed = JSON.parse(message.content);
+    const parsed = JSON.parse(content);
     if (Array.isArray(parsed) && parsed.length > 0 && typeof parsed[0].line === "string") {
       summaries = parsed;
     }
@@ -1535,9 +1586,9 @@ function ToolMessage({ message }) {
           "Tool:",
           " "
         ] }),
-        message.toolName && /* @__PURE__ */ jsxs2(Text2, { color: "white", dimColor: true, children: [
+        toolName && /* @__PURE__ */ jsxs2(Text2, { color: "white", dimColor: true, children: [
           "[",
-          message.toolName,
+          toolName,
           "]"
         ] })
       ] }),
@@ -1553,16 +1604,16 @@ function ToolMessage({ message }) {
       ] }, i))
     ] });
   }
-  const lines = message.content.split("\n").filter((l) => l.trim());
+  const lines = content.split("\n").filter((l) => l.trim());
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ jsxs2(Box2, { children: [
       /* @__PURE__ */ jsxs2(Text2, { color: "white", bold: true, children: [
         "Tool:",
         " "
       ] }),
-      message.toolName && /* @__PURE__ */ jsxs2(Text2, { color: "white", dimColor: true, children: [
+      toolName && /* @__PURE__ */ jsxs2(Text2, { color: "white", dimColor: true, children: [
         "[",
-        message.toolName,
+        toolName,
         "]"
       ] })
     ] }),
@@ -1578,21 +1629,15 @@ function ToolMessage({ message }) {
 var MessageItem = React2.memo(function MessageItem2({
   message
 }) {
-  if (message.role === "tool") {
+  if (isToolMessage(message)) {
     return /* @__PURE__ */ jsx(ToolMessage, { message });
   }
+  const content = message.content ?? "";
+  const isInterrupted = message.state === "interrupted";
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsx(RoleLabel, { role: message.role }),
-      message.toolName && /* @__PURE__ */ jsxs2(Text2, { color: "magenta", dimColor: true, children: [
-        "[",
-        message.toolName,
-        "]",
-        " "
-      ] })
-    ] }),
+    /* @__PURE__ */ jsx(Box2, { children: /* @__PURE__ */ jsx(RoleLabel, { role: message.role }) }),
     /* @__PURE__ */ jsx(Text2, { children: " " }),
-    /* @__PURE__ */ jsx(Box2, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text2, { wrap: "wrap", children: message.role === "assistant" ? renderMarkdown(message.content) : message.content }) })
+    /* @__PURE__ */ jsx(Box2, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text2, { wrap: "wrap", children: isAssistantMessage(message) ? renderMarkdown(content + (isInterrupted ? "\n\n_(interrupted)_" : "")) : content }) })
   ] });
 });
 function MessageList({ messages }) {
@@ -1971,7 +2016,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
         isSubcommandMode
       }
     ),
-    /* @__PURE__ */ jsx6(Box5, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ jsx6(WaveText, { text: "  Waiting for response..." }) : /* @__PURE__ */ jsxs5(Box5, { children: [
+    /* @__PURE__ */ jsx6(Box5, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ jsx6(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ jsxs5(Box5, { children: [
       /* @__PURE__ */ jsx6(Text7, { color: "green", bold: true, children: "> " }),
       /* @__PURE__ */ jsx6(
         CjkTextInput,
@@ -2096,7 +2141,7 @@ function PermissionPrompt({ request }) {
 
 // src/ui/StreamingIndicator.tsx
 import { Box as Box8, Text as Text10 } from "ink";
-import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 function getToolStyle(t) {
   if (t.isRunning) return { color: "yellow", icon: "\u27F3", strikethrough: false };
   if (t.result === "error") return { color: "red", icon: "\u2717", strikethrough: true };
@@ -2107,7 +2152,7 @@ function StreamingIndicator({ text, activeTools }) {
   const hasTools = activeTools.length > 0;
   const hasText = text.length > 0;
   if (!hasTools && !hasText) {
-    return /* @__PURE__ */ jsx9(Text10, { color: "yellow", children: "Thinking..." });
+    return /* @__PURE__ */ jsx9(Fragment2, {});
   }
   return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
     hasTools && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", marginBottom: 1, children: [
@@ -2689,19 +2734,21 @@ function App(props) {
             try {
               const settingsPath = getUserSettingsPath();
               updateModelInSettings(settingsPath, pendingModelId);
-              addMessage({
-                role: "system",
-                content: `Model changed to ${getModelName(pendingModelId)}. Restarting...`
-              });
+              addMessage(
+                createSystemMessage3(
+                  `Model changed to ${getModelName(pendingModelId)}. Restarting...`
+                )
+              );
               setTimeout(() => exit(), EXIT_DELAY_MS2);
             } catch (err) {
-              addMessage({
-                role: "system",
-                content: `Failed: ${err instanceof Error ? err.message : String(err)}`
-              });
+              addMessage(
+                createSystemMessage3(
+                  `Failed: ${err instanceof Error ? err.message : String(err)}`
+                )
+              );
             }
           } else {
-            addMessage({ role: "system", content: "Model change cancelled." });
+            addMessage(createSystemMessage3("Model change cancelled."));
           }
         }
       }
@@ -2711,7 +2758,7 @@ function App(props) {
       {
         callbacks: pluginCallbacks,
         onClose: () => setShowPluginTUI(false),
-        addMessage: (msg) => addMessage(msg)
+        addMessage: (msg) => addMessage(createSystemMessage3(msg.content))
       }
     ),
     /* @__PURE__ */ jsx13(

package/dist/node/index.cjs

@@ -184,7 +184,8 @@ var import_ink14 = require("ink");
 // src/ui/App.tsx
 var import_react16 = require("react");
 var import_ink13 = require("ink");
-var import_agent_core3 = require("@robota-sdk/agent-core");
+var import_agent_core6 = require("@robota-sdk/agent-core");
+var import_agent_core7 = require("@robota-sdk/agent-core");
 
 // src/ui/hooks/useSession.ts
 var import_react = require("react");
@@ -280,6 +281,7 @@ var NOOP_TERMINAL = {
 function useSession(props) {
   const [permissionRequest, setPermissionRequest] = (0, import_react.useState)(null);
   const [streamingText, setStreamingText] = (0, import_react.useState)("");
+  const streamingTextRef = (0, import_react.useRef)("");
   const [activeTools, setActiveTools] = (0, import_react.useState)([]);
   const permissionQueueRef = (0, import_react.useRef)([]);
   const processingRef = (0, import_react.useRef)(false);
@@ -311,8 +313,15 @@ function useSession(props) {
         processNextPermission();
       });
     };
+    let flushTimer = null;
     const onTextDelta = (delta) => {
-      setStreamingText((prev) => prev + delta);
+      streamingTextRef.current += delta;
+      if (!flushTimer) {
+        flushTimer = setTimeout(() => {
+          setStreamingText(streamingTextRef.current);
+          flushTimer = null;
+        }, 16);
+      }
     };
     const onToolExecution = (event) => {
       if (event.type === "start") {
@@ -391,6 +400,7 @@ function useSession(props) {
   }
   const clearStreamingText = (0, import_react.useCallback)(() => {
     setStreamingText("");
+    streamingTextRef.current = "";
     setActiveTools([]);
   }, []);
   return {
@@ -405,16 +415,11 @@ function useSession(props) {
 // src/ui/hooks/useMessages.ts
 var import_react2 = require("react");
 var MAX_RENDERED_MESSAGES = 100;
-var msgIdCounter = 0;
-function nextId() {
-  msgIdCounter += 1;
-  return `msg_${msgIdCounter}`;
-}
 function useMessages() {
   const [messages, setMessages] = (0, import_react2.useState)([]);
   const addMessage = (0, import_react2.useCallback)((msg) => {
     setMessages((prev) => {
-      const updated = [...prev, { ...msg, id: nextId(), timestamp: /* @__PURE__ */ new Date() }];
+      const updated = [...prev, msg];
       if (updated.length > MAX_RENDERED_MESSAGES) {
         return updated.slice(-MAX_RENDERED_MESSAGES);
       }
@@ -426,6 +431,7 @@ function useMessages() {
 
 // src/ui/hooks/useSlashCommands.ts
 var import_react3 = require("react");
+var import_agent_core = require("@robota-sdk/agent-core");
 
 // src/commands/slash-executor.ts
 var VALID_MODES2 = ["plan", "default", "acceptEdits", "bypassPermissions"];
@@ -692,11 +698,14 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
       const cmd = parts[0]?.toLowerCase() ?? "";
       const args = parts.slice(1).join(" ");
       const clearMessages = () => setMessages([]);
+      const slashAddMessage = (msg) => {
+        addMessage((0, import_agent_core.createSystemMessage)(msg.content));
+      };
       const result = await executeSlashCommand(
         cmd,
         args,
         session,
-        addMessage,
+        slashAddMessage,
         clearMessages,
         registry,
         pluginCallbacks
@@ -729,7 +738,9 @@ function useSlashCommands(session, addMessage, setMessages, exit, registry, pend
 
 // src/ui/hooks/useSubmitHandler.ts
 var import_react4 = require("react");
+var import_node_crypto = require("crypto");
 var import_agent_sdk2 = require("@robota-sdk/agent-sdk");
+var import_agent_core2 = require("@robota-sdk/agent-core");
 
 // src/utils/tool-call-extractor.ts
 var TOOL_ARG_MAX_LENGTH = 80;
@@ -886,21 +897,50 @@ async function runSessionPrompt(prompt, session, addMessage, clearStreamingText,
       historyBefore
     );
     if (toolSummaries.length > 0) {
-      addMessage({
-        role: "tool",
-        content: JSON.stringify(toolSummaries),
-        toolName: `${toolSummaries.length} tools`
-      });
+      addMessage(
+        (0, import_agent_core2.createToolMessage)(JSON.stringify(toolSummaries), {
+          toolCallId: (0, import_node_crypto.randomUUID)(),
+          name: `${toolSummaries.length} tools`
+        })
+      );
     }
-    addMessage({ role: "assistant", content: response || "(empty response)" });
+    addMessage((0, import_agent_core2.createAssistantMessage)(response || "(empty response)"));
     syncContextState(session, setContextState);
   } catch (err) {
     clearStreamingText();
-    if (err instanceof DOMException && err.name === "AbortError") {
-      addMessage({ role: "system", content: "Cancelled." });
+    const isAbortError = err instanceof DOMException && err.name === "AbortError" || err instanceof Error && (err.message.includes("aborted") || err.message.includes("abort"));
+    if (isAbortError) {
+      const history = session.getHistory();
+      const toolSummaries = extractToolCallsWithDiff(
+        history,
+        historyBefore
+      );
+      if (toolSummaries.length > 0) {
+        addMessage(
+          (0, import_agent_core2.createToolMessage)(JSON.stringify(toolSummaries), {
+            toolCallId: (0, import_node_crypto.randomUUID)(),
+            name: `${toolSummaries.length} tools`
+          })
+        );
+      }
+      const assistantParts = [];
+      let lastAssistantState = "complete";
+      for (let i = historyBefore; i < history.length; i++) {
+        const msg = history[i];
+        if (msg && msg.role === "assistant" && msg.content) {
+          assistantParts.push(msg.content);
+          if (msg.state === "interrupted") lastAssistantState = "interrupted";
+        }
+      }
+      if (assistantParts.length > 0) {
+        addMessage(
+          (0, import_agent_core2.createAssistantMessage)(assistantParts.join("\n\n"), { state: lastAssistantState })
+        );
+      }
+      addMessage((0, import_agent_core2.createSystemMessage)("Interrupted by user."));
     } else {
       const errMsg = err instanceof Error ? err.message : String(err);
-      addMessage({ role: "system", content: `Error: ${errMsg}` });
+      addMessage((0, import_agent_core2.createSystemMessage)(`Error: ${errMsg}`));
     }
   } finally {
     setIsThinking(false);
@@ -953,7 +993,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           const runInFork = createForkRunner(session);
           const result = await executeSkill(skill, args, { runInFork });
           if (result.mode === "fork") {
-            addMessage({ role: "assistant", content: result.result ?? "(empty response)" });
+            addMessage((0, import_agent_core2.createAssistantMessage)(result.result ?? "(empty response)"));
             syncContextState(session, setContextState);
             return;
           }
@@ -988,7 +1028,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           hookInput
         );
       }
-      addMessage({ role: "user", content: input });
+      addMessage((0, import_agent_core2.createUserMessage)(input));
       return runSessionPrompt(
         input,
         session,
@@ -1055,16 +1095,16 @@ var CommandRegistry = class {
 };
 
 // src/commands/builtin-source.ts
-var import_agent_core = require("@robota-sdk/agent-core");
+var import_agent_core3 = require("@robota-sdk/agent-core");
 function buildModelSubcommands() {
   const seen = /* @__PURE__ */ new Set();
   const commands = [];
-  for (const model of Object.values(import_agent_core.CLAUDE_MODELS)) {
+  for (const model of Object.values(import_agent_core3.CLAUDE_MODELS)) {
     if (seen.has(model.name)) continue;
     seen.add(model.name);
     commands.push({
       name: model.id,
-      description: `${model.name} (${(0, import_agent_core.formatTokenCount)(model.contextWindow).toUpperCase()})`,
+      description: `${model.name} (${(0, import_agent_core3.formatTokenCount)(model.contextWindow).toUpperCase()})`,
       source: "builtin"
     });
   }
@@ -1459,6 +1499,7 @@ function usePluginCallbacks(cwd) {
 // src/ui/MessageList.tsx
 var import_react7 = __toESM(require("react"), 1);
 var import_ink2 = require("ink");
+var import_agent_core4 = require("@robota-sdk/agent-core");
 
 // src/ui/render-markdown.ts
 var import_marked = require("marked");
@@ -1544,9 +1585,14 @@ function RoleLabel({ role }) {
   }
 }
 function ToolMessage({ message }) {
+  if (!(0, import_agent_core4.isToolMessage)(message)) {
+    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, {});
+  }
+  const toolName = message.name;
+  const content = message.content;
   let summaries = null;
   try {
-    const parsed = JSON.parse(message.content);
+    const parsed = JSON.parse(content);
     if (Array.isArray(parsed) && parsed.length > 0 && typeof parsed[0].line === "string") {
       summaries = parsed;
     }
@@ -1559,9 +1605,9 @@ function ToolMessage({ message }) {
           "Tool:",
           " "
         ] }),
-        message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
+        toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
           "[",
-          message.toolName,
+          toolName,
           "]"
         ] })
       ] }),
@@ -1577,16 +1623,16 @@ function ToolMessage({ message }) {
       ] }, i))
     ] });
   }
-  const lines = message.content.split("\n").filter((l) => l.trim());
+  const lines = content.split("\n").filter((l) => l.trim());
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", bold: true, children: [
         "Tool:",
         " "
       ] }),
-      message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
+      toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "white", dimColor: true, children: [
         "[",
-        message.toolName,
+        toolName,
         "]"
       ] })
     ] }),
@@ -1602,21 +1648,15 @@ function ToolMessage({ message }) {
 var MessageItem = import_react7.default.memo(function MessageItem2({
   message
 }) {
-  if (message.role === "tool") {
+  if ((0, import_agent_core4.isToolMessage)(message)) {
     return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(ToolMessage, { message });
   }
+  const content = message.content ?? "";
+  const isInterrupted = message.state === "interrupted";
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Box, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RoleLabel, { role: message.role }),
-      message.toolName && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink2.Text, { color: "magenta", dimColor: true, children: [
-        "[",
-        message.toolName,
-        "]",
-        " "
-      ] })
-    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(RoleLabel, { role: message.role }) }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { children: " " }),
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { wrap: "wrap", children: message.role === "assistant" ? renderMarkdown(message.content) : message.content }) })
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_ink2.Text, { wrap: "wrap", children: (0, import_agent_core4.isAssistantMessage)(message) ? renderMarkdown(content + (isInterrupted ? "\n\n_(interrupted)_" : "")) : content }) })
   ] });
 });
 function MessageList({ messages }) {
@@ -1625,7 +1665,7 @@ function MessageList({ messages }) {
 
 // src/ui/StatusBar.tsx
 var import_ink3 = require("ink");
-var import_agent_core2 = require("@robota-sdk/agent-core");
+var import_agent_core5 = require("@robota-sdk/agent-core");
 var import_jsx_runtime3 = require("react/jsx-runtime");
 var CONTEXT_YELLOW_THRESHOLD = 70;
 var CONTEXT_RED_THRESHOLD = 90;
@@ -1665,9 +1705,9 @@ function StatusBar({
             "Context: ",
             Math.round(contextPercentage),
             "% (",
-            (0, import_agent_core2.formatTokenCount)(contextUsedTokens),
+            (0, import_agent_core5.formatTokenCount)(contextUsedTokens),
             "/",
-            (0, import_agent_core2.formatTokenCount)(contextMaxTokens),
+            (0, import_agent_core5.formatTokenCount)(contextMaxTokens),
             ")"
           ] })
         ] }),
@@ -1995,7 +2035,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
         isSubcommandMode
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Box, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response..." }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Box, { borderStyle: "single", borderColor: isDisabled ? "gray" : "green", paddingLeft: 1, children: isDisabled ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(WaveText, { text: "  Waiting for response... (ESC to interrupt)" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_ink7.Box, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_ink7.Text, { color: "green", bold: true, children: "> " }),
       /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
         CjkTextInput,
@@ -2131,7 +2171,7 @@ function StreamingIndicator({ text, activeTools }) {
   const hasTools = activeTools.length > 0;
   const hasText = text.length > 0;
   if (!hasTools && !hasText) {
-    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_ink10.Text, { color: "yellow", children: "Thinking..." });
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_jsx_runtime10.Fragment, {});
   }
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", children: [
     hasTools && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", marginBottom: 1, children: [
@@ -2705,7 +2745,7 @@ function App(props) {
     pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       ConfirmPrompt,
       {
-        message: `Change model to ${(0, import_agent_core3.getModelName)(pendingModelId)}? This will restart the session.`,
+        message: `Change model to ${(0, import_agent_core6.getModelName)(pendingModelId)}? This will restart the session.`,
         onSelect: (index) => {
           setPendingModelId(null);
           pendingModelChangeRef.current = null;
@@ -2713,19 +2753,21 @@ function App(props) {
             try {
               const settingsPath = getUserSettingsPath();
               updateModelInSettings(settingsPath, pendingModelId);
-              addMessage({
-                role: "system",
-                content: `Model changed to ${(0, import_agent_core3.getModelName)(pendingModelId)}. Restarting...`
-              });
+              addMessage(
+                (0, import_agent_core7.createSystemMessage)(
+                  `Model changed to ${(0, import_agent_core6.getModelName)(pendingModelId)}. Restarting...`
+                )
+              );
               setTimeout(() => exit(), EXIT_DELAY_MS2);
             } catch (err) {
-              addMessage({
-                role: "system",
-                content: `Failed: ${err instanceof Error ? err.message : String(err)}`
-              });
+              addMessage(
+                (0, import_agent_core7.createSystemMessage)(
+                  `Failed: ${err instanceof Error ? err.message : String(err)}`
+                )
+              );
             }
           } else {
-            addMessage({ role: "system", content: "Model change cancelled." });
+            addMessage((0, import_agent_core7.createSystemMessage)("Model change cancelled."));
           }
         }
       }
@@ -2735,14 +2777,14 @@ function App(props) {
       {
         callbacks: pluginCallbacks,
         onClose: () => setShowPluginTUI(false),
-        addMessage: (msg) => addMessage(msg)
+        addMessage: (msg) => addMessage((0, import_agent_core7.createSystemMessage)(msg.content))
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
       StatusBar,
       {
         permissionMode: session.getPermissionMode(),
-        modelName: (0, import_agent_core3.getModelName)(props.config.provider.model),
+        modelName: (0, import_agent_core6.getModelName)(props.config.provider.model),
         sessionId: session.getSessionId(),
         messageCount: messages.length,
         isThinking,

package/dist/node/index.js

@@ -1,6 +1,6 @@
 import {
   startCli
-} from "./chunk-27OPEZHA.js";
+} from "./chunk-ERF646KY.js";
 
 // src/index.ts
 import { Session, SessionStore, query, TRUST_TO_MODE } from "@robota-sdk/agent-sdk";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robota-sdk/agent-cli",
-  "version": "3.0.0-beta.35",
+  "version": "3.0.0-beta.36",
   "description": "AI coding assistant CLI built on Robota SDK",
   "type": "module",
   "bin": {
@@ -35,8 +35,8 @@
     "marked-terminal": "^7.3.0",
     "react": "19.2.4",
     "string-width": "^8.2.0",
-    "@robota-sdk/agent-sdk": "3.0.0-beta.33",
-    "@robota-sdk/agent-core": "3.0.0-beta.33"
+    "@robota-sdk/agent-core": "3.0.0-beta.33",
+    "@robota-sdk/agent-sdk": "3.0.0-beta.33"
   },
   "devDependencies": {
     "@types/marked": "^6.0.0",