@robota-sdk/agent-cli 3.0.0-beta.18 → 3.0.0-beta.19

package/dist/node/bin.cjs

@@ -164,8 +164,123 @@ var PrintTerminal = class {
 var import_ink11 = require("ink");
 
 // src/ui/App.tsx
-var import_react6 = require("react");
+var import_react11 = require("react");
 var import_ink10 = require("ink");
+var import_agent_core3 = require("@robota-sdk/agent-core");
+
+// src/ui/hooks/useSession.ts
+var import_react = require("react");
+var import_agent_sdk = require("@robota-sdk/agent-sdk");
+var TOOL_ARG_DISPLAY_MAX = 80;
+var TOOL_ARG_TRUNCATE_AT = 77;
+var NOOP_TERMINAL = {
+  write: () => {
+  },
+  writeLine: () => {
+  },
+  writeMarkdown: () => {
+  },
+  writeError: () => {
+  },
+  prompt: () => Promise.resolve(""),
+  select: () => Promise.resolve(0),
+  spinner: () => ({ stop: () => {
+  }, update: () => {
+  } })
+};
+function useSession(props) {
+  const [permissionRequest, setPermissionRequest] = (0, import_react.useState)(null);
+  const [streamingText, setStreamingText] = (0, import_react.useState)("");
+  const [activeTools, setActiveTools] = (0, import_react.useState)([]);
+  const permissionQueueRef = (0, import_react.useRef)([]);
+  const processingRef = (0, import_react.useRef)(false);
+  const processNextPermission = (0, import_react.useCallback)(() => {
+    if (processingRef.current) return;
+    const next = permissionQueueRef.current[0];
+    if (!next) {
+      setPermissionRequest(null);
+      return;
+    }
+    processingRef.current = true;
+    setPermissionRequest({
+      toolName: next.toolName,
+      toolArgs: next.toolArgs,
+      resolve: (result) => {
+        permissionQueueRef.current.shift();
+        processingRef.current = false;
+        setPermissionRequest(null);
+        next.resolve(result);
+        setTimeout(() => processNextPermission(), 0);
+      }
+    });
+  }, []);
+  const sessionRef = (0, import_react.useRef)(null);
+  if (sessionRef.current === null) {
+    const permissionHandler = (toolName, toolArgs) => {
+      return new Promise((resolve) => {
+        permissionQueueRef.current.push({ toolName, toolArgs, resolve });
+        processNextPermission();
+      });
+    };
+    const onTextDelta = (delta) => {
+      setStreamingText((prev) => prev + delta);
+    };
+    const onToolExecution = (event) => {
+      if (event.type === "start") {
+        let firstArg = "";
+        if (event.toolArgs) {
+          const firstVal = Object.values(event.toolArgs)[0];
+          const raw = typeof firstVal === "string" ? firstVal : JSON.stringify(firstVal ?? "");
+          firstArg = raw.length > TOOL_ARG_DISPLAY_MAX ? raw.slice(0, TOOL_ARG_TRUNCATE_AT) + "..." : raw;
+        }
+        setActiveTools((prev) => [...prev, { toolName: event.toolName, firstArg, isRunning: true }]);
+      } else {
+        setActiveTools(
+          (prev) => prev.map(
+            (t) => t.toolName === event.toolName && t.isRunning ? { ...t, isRunning: false } : t
+          )
+        );
+      }
+    };
+    const paths = (0, import_agent_sdk.projectPaths)(props.cwd ?? process.cwd());
+    sessionRef.current = (0, import_agent_sdk.createSession)({
+      config: props.config,
+      context: props.context,
+      terminal: NOOP_TERMINAL,
+      sessionLogger: new import_agent_sdk.FileSessionLogger(paths.logs),
+      projectInfo: props.projectInfo,
+      sessionStore: props.sessionStore,
+      permissionMode: props.permissionMode,
+      maxTurns: props.maxTurns,
+      permissionHandler,
+      onTextDelta,
+      onToolExecution
+    });
+  }
+  const clearStreamingText = (0, import_react.useCallback)(() => {
+    setStreamingText("");
+    setActiveTools([]);
+  }, []);
+  return { session: sessionRef.current, permissionRequest, streamingText, clearStreamingText, activeTools };
+}
+
+// src/ui/hooks/useMessages.ts
+var import_react2 = require("react");
+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) => [...prev, { ...msg, id: nextId(), timestamp: /* @__PURE__ */ new Date() }]);
+  }, []);
+  return { messages, setMessages, addMessage };
+}
+
+// src/ui/hooks/useSlashCommands.ts
+var import_react3 = require("react");
 
 // src/commands/slash-executor.ts
 var VALID_MODES2 = ["plan", "default", "acceptEdits", "bypassPermissions"];
@@ -290,9 +405,133 @@ async function executeSlashCommand(cmd, args, session, addMessage, clearMessages
   }
 }
 
-// src/ui/App.tsx
-var import_agent_sdk = require("@robota-sdk/agent-sdk");
-var import_agent_core3 = require("@robota-sdk/agent-core");
+// src/ui/hooks/useSlashCommands.ts
+var EXIT_DELAY_MS = 500;
+function useSlashCommands(session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId) {
+  return (0, import_react3.useCallback)(
+    async (input) => {
+      const parts = input.slice(1).split(/\s+/);
+      const cmd = parts[0]?.toLowerCase() ?? "";
+      const args = parts.slice(1).join(" ");
+      const clearMessages = () => setMessages([]);
+      const result = await executeSlashCommand(cmd, args, session, addMessage, clearMessages, registry);
+      if (result.pendingModelId) {
+        pendingModelChangeRef.current = result.pendingModelId;
+        setPendingModelId(result.pendingModelId);
+      }
+      if (result.exitRequested) {
+        setTimeout(() => exit(), EXIT_DELAY_MS);
+      }
+      return result.handled;
+    },
+    [session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId]
+  );
+}
+
+// src/ui/hooks/useSubmitHandler.ts
+var import_react4 = require("react");
+
+// src/utils/tool-call-extractor.ts
+var TOOL_ARG_MAX_LENGTH = 80;
+var TOOL_ARG_TRUNCATE_LENGTH = 77;
+function extractToolCalls(history, startIndex) {
+  const lines = [];
+  for (let i = startIndex; i < history.length; i++) {
+    const msg = history[i];
+    if (msg.role === "assistant" && msg.toolCalls) {
+      for (const tc of msg.toolCalls) {
+        const value = parseFirstArgValue(tc.function.arguments);
+        const truncated = value.length > TOOL_ARG_MAX_LENGTH ? value.slice(0, TOOL_ARG_TRUNCATE_LENGTH) + "..." : value;
+        lines.push(`${tc.function.name}(${truncated})`);
+      }
+    }
+  }
+  return lines;
+}
+function parseFirstArgValue(argsJson) {
+  try {
+    const parsed = JSON.parse(argsJson);
+    const firstVal = Object.values(parsed)[0];
+    return typeof firstVal === "string" ? firstVal : JSON.stringify(firstVal);
+  } catch {
+    return argsJson;
+  }
+}
+
+// src/utils/skill-prompt.ts
+function buildSkillPrompt(input, registry) {
+  const parts = input.slice(1).split(/\s+/);
+  const cmd = parts[0]?.toLowerCase() ?? "";
+  const skillCmd = registry.getCommands().find((c) => c.name === cmd && c.source === "skill");
+  if (!skillCmd) return null;
+  const args = parts.slice(1).join(" ").trim();
+  const userInstruction = args || skillCmd.description;
+  if (skillCmd.skillContent) {
+    return `<skill name="${cmd}">
+${skillCmd.skillContent}
+</skill>
+
+Execute the "${cmd}" skill: ${userInstruction}`;
+  }
+  return `Use the "${cmd}" skill: ${userInstruction}`;
+}
+
+// src/ui/hooks/useSubmitHandler.ts
+function syncContextState(session, setter) {
+  const ctx = session.getContextState();
+  setter({ percentage: ctx.usedPercentage, usedTokens: ctx.usedTokens, maxTokens: ctx.maxTokens });
+}
+async function runSessionPrompt(prompt, session, addMessage, clearStreamingText, setIsThinking, setContextState) {
+  setIsThinking(true);
+  clearStreamingText();
+  const historyBefore = session.getHistory().length;
+  try {
+    const response = await session.run(prompt);
+    clearStreamingText();
+    const history = session.getHistory();
+    const toolLines = extractToolCalls(
+      history,
+      historyBefore
+    );
+    if (toolLines.length > 0) {
+      addMessage({ role: "tool", content: toolLines.join("\n"), toolName: `${toolLines.length} tools` });
+    }
+    addMessage({ role: "assistant", content: response || "(empty response)" });
+    syncContextState(session, setContextState);
+  } catch (err) {
+    clearStreamingText();
+    if (err instanceof DOMException && err.name === "AbortError") {
+      addMessage({ role: "system", content: "Cancelled." });
+    } else {
+      const errMsg = err instanceof Error ? err.message : String(err);
+      addMessage({ role: "system", content: `Error: ${errMsg}` });
+    }
+  } finally {
+    setIsThinking(false);
+  }
+}
+function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamingText, setIsThinking, setContextState, registry) {
+  return (0, import_react4.useCallback)(
+    async (input) => {
+      if (input.startsWith("/")) {
+        const handled = await handleSlashCommand(input);
+        if (handled) {
+          syncContextState(session, setContextState);
+          return;
+        }
+        const prompt = buildSkillPrompt(input, registry);
+        if (!prompt) return;
+        return runSessionPrompt(prompt, session, addMessage, clearStreamingText, setIsThinking, setContextState);
+      }
+      addMessage({ role: "user", content: input });
+      return runSessionPrompt(input, session, addMessage, clearStreamingText, setIsThinking, setContextState);
+    },
+    [session, addMessage, handleSlashCommand, clearStreamingText, setIsThinking, setContextState, registry]
+  );
+}
+
+// src/ui/hooks/useCommandRegistry.ts
+var import_react5 = require("react");
 
 // src/commands/command-registry.ts
 var CommandRegistry = class {
@@ -446,6 +685,18 @@ var SkillCommandSource = class {
   }
 };
 
+// src/ui/hooks/useCommandRegistry.ts
+function useCommandRegistry(cwd) {
+  const registryRef = (0, import_react5.useRef)(null);
+  if (registryRef.current === null) {
+    const registry = new CommandRegistry();
+    registry.addSource(new BuiltinCommandSource());
+    registry.addSource(new SkillCommandSource(cwd));
+    registryRef.current = registry;
+  }
+  return registryRef.current;
+}
+
 // src/ui/MessageList.tsx
 var import_ink = require("ink");
 
@@ -566,11 +817,11 @@ function StatusBar({
 }
 
 // src/ui/InputArea.tsx
-var import_react3 = __toESM(require("react"), 1);
+var import_react8 = __toESM(require("react"), 1);
 var import_ink6 = require("ink");
 
 // src/ui/CjkTextInput.tsx
-var import_react = require("react");
+var import_react6 = require("react");
 var import_ink3 = require("ink");
 var import_chalk = __toESM(require("chalk"), 1);
 var import_jsx_runtime3 = require("react/jsx-runtime");
@@ -590,9 +841,9 @@ function CjkTextInput({
   focus = true,
   showCursor = true
 }) {
-  const valueRef = (0, import_react.useRef)(value);
-  const cursorRef = (0, import_react.useRef)(value.length);
-  const [, forceRender] = (0, import_react.useState)(0);
+  const valueRef = (0, import_react6.useRef)(value);
+  const cursorRef = (0, import_react6.useRef)(value.length);
+  const [, forceRender] = (0, import_react6.useState)(0);
   if (value !== valueRef.current) {
     valueRef.current = value;
     if (cursorRef.current > value.length) {
@@ -669,15 +920,15 @@ function renderWithCursor(value, cursorOffset, placeholder, showCursor) {
 }
 
 // src/ui/WaveText.tsx
-var import_react2 = require("react");
+var import_react7 = require("react");
 var import_ink4 = require("ink");
 var import_jsx_runtime4 = require("react/jsx-runtime");
 var WAVE_COLORS = ["#666666", "#888888", "#aaaaaa", "#888888"];
 var INTERVAL_MS = 400;
 var CHARS_PER_GROUP = 4;
 function WaveText({ text }) {
-  const [tick, setTick] = (0, import_react2.useState)(0);
-  (0, import_react2.useEffect)(() => {
+  const [tick, setTick] = (0, import_react7.useState)(0);
+  (0, import_react7.useEffect)(() => {
     const timer = setInterval(() => {
       setTick((prev) => prev + 1);
     }, INTERVAL_MS);
@@ -743,16 +994,16 @@ function parseSlashInput(value) {
   return { isSlash: true, parentCommand: parent, filter: rest };
 }
 function useAutocomplete(value, registry) {
-  const [selectedIndex, setSelectedIndex] = (0, import_react3.useState)(0);
-  const [dismissed, setDismissed] = (0, import_react3.useState)(false);
-  const prevValueRef = import_react3.default.useRef(value);
+  const [selectedIndex, setSelectedIndex] = (0, import_react8.useState)(0);
+  const [dismissed, setDismissed] = (0, import_react8.useState)(false);
+  const prevValueRef = import_react8.default.useRef(value);
   if (prevValueRef.current !== value) {
     prevValueRef.current = value;
     if (dismissed) setDismissed(false);
   }
   const parsed = parseSlashInput(value);
   const isSubcommandMode = parsed.isSlash && parsed.parentCommand.length > 0;
-  const filteredCommands = (0, import_react3.useMemo)(() => {
+  const filteredCommands = (0, import_react8.useMemo)(() => {
     if (!registry || !parsed.isSlash || dismissed) return [];
     if (isSubcommandMode) {
       const subs = registry.getSubcommands(parsed.parentCommand);
@@ -786,7 +1037,7 @@ function useAutocomplete(value, registry) {
   };
 }
 function InputArea({ onSubmit, isDisabled, registry }) {
-  const [value, setValue] = (0, import_react3.useState)("");
+  const [value, setValue] = (0, import_react8.useState)("");
   const {
     showPopup,
     filteredCommands,
@@ -795,7 +1046,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
     isSubcommandMode,
     setShowPopup
   } = useAutocomplete(value, registry);
-  const handleSubmit = (0, import_react3.useCallback)(
+  const handleSubmit = (0, import_react8.useCallback)(
     (text) => {
       const trimmed = text.trim();
       if (trimmed.length === 0) return;
@@ -808,7 +1059,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
     },
     [showPopup, filteredCommands, selectedIndex, onSubmit]
   );
-  const selectCommand = (0, import_react3.useCallback)(
+  const selectCommand = (0, import_react8.useCallback)(
     (cmd) => {
       const parsed = parseSlashInput(value);
       if (parsed.parentCommand) {
@@ -869,7 +1120,7 @@ function InputArea({ onSubmit, isDisabled, registry }) {
 }
 
 // src/ui/ConfirmPrompt.tsx
-var import_react4 = require("react");
+var import_react9 = require("react");
 var import_ink7 = require("ink");
 var import_jsx_runtime7 = require("react/jsx-runtime");
 function ConfirmPrompt({
@@ -877,9 +1128,9 @@ function ConfirmPrompt({
   options = ["Yes", "No"],
   onSelect
 }) {
-  const [selected, setSelected] = (0, import_react4.useState)(0);
-  const resolvedRef = (0, import_react4.useRef)(false);
-  const doSelect = (0, import_react4.useCallback)(
+  const [selected, setSelected] = (0, import_react9.useState)(0);
+  const resolvedRef = (0, import_react9.useRef)(false);
+  const doSelect = (0, import_react9.useCallback)(
     (index) => {
       if (resolvedRef.current) return;
       resolvedRef.current = true;
@@ -912,7 +1163,7 @@ function ConfirmPrompt({
 }
 
 // src/ui/PermissionPrompt.tsx
-var import_react5 = __toESM(require("react"), 1);
+var import_react10 = __toESM(require("react"), 1);
 var import_ink8 = require("ink");
 var import_jsx_runtime8 = require("react/jsx-runtime");
 var OPTIONS = ["Allow", "Allow always (this session)", "Deny"];
@@ -922,15 +1173,15 @@ function formatArgs(args) {
   return entries.map(([k, v]) => `${k}: ${typeof v === "string" ? v : JSON.stringify(v)}`).join(", ");
 }
 function PermissionPrompt({ request }) {
-  const [selected, setSelected] = import_react5.default.useState(0);
-  const resolvedRef = import_react5.default.useRef(false);
-  const prevRequestRef = import_react5.default.useRef(request);
+  const [selected, setSelected] = import_react10.default.useState(0);
+  const resolvedRef = import_react10.default.useRef(false);
+  const prevRequestRef = import_react10.default.useRef(request);
   if (prevRequestRef.current !== request) {
     prevRequestRef.current = request;
     resolvedRef.current = false;
     setSelected(0);
   }
-  const doResolve = import_react5.default.useCallback(
+  const doResolve = import_react10.default.useCallback(
     (index) => {
       if (resolvedRef.current) return;
       resolvedRef.current = true;
@@ -975,33 +1226,6 @@ function PermissionPrompt({ request }) {
   ] });
 }
 
-// src/utils/tool-call-extractor.ts
-var TOOL_ARG_MAX_LENGTH = 80;
-var TOOL_ARG_TRUNCATE_LENGTH = 77;
-function extractToolCalls(history, startIndex) {
-  const lines = [];
-  for (let i = startIndex; i < history.length; i++) {
-    const msg = history[i];
-    if (msg.role === "assistant" && msg.toolCalls) {
-      for (const tc of msg.toolCalls) {
-        const value = parseFirstArgValue(tc.function.arguments);
-        const truncated = value.length > TOOL_ARG_MAX_LENGTH ? value.slice(0, TOOL_ARG_TRUNCATE_LENGTH) + "..." : value;
-        lines.push(`${tc.function.name}(${truncated})`);
-      }
-    }
-  }
-  return lines;
-}
-function parseFirstArgValue(argsJson) {
-  try {
-    const parsed = JSON.parse(argsJson);
-    const firstVal = Object.values(parsed)[0];
-    return typeof firstVal === "string" ? firstVal : JSON.stringify(firstVal);
-  } catch {
-    return argsJson;
-  }
-}
-
 // src/ui/StreamingIndicator.tsx
 var import_ink9 = require("ink");
 var import_jsx_runtime9 = require("react/jsx-runtime");
@@ -1035,240 +1259,21 @@ function StreamingIndicator({ text, activeTools }) {
 
 // src/ui/App.tsx
 var import_jsx_runtime10 = require("react/jsx-runtime");
-var msgIdCounter = 0;
-function nextId() {
-  msgIdCounter += 1;
-  return `msg_${msgIdCounter}`;
-}
-var NOOP_TERMINAL = {
-  write: () => {
-  },
-  writeLine: () => {
-  },
-  writeMarkdown: () => {
-  },
-  writeError: () => {
-  },
-  prompt: () => Promise.resolve(""),
-  select: () => Promise.resolve(0),
-  spinner: () => ({ stop: () => {
-  }, update: () => {
-  } })
-};
-function useSession(props) {
-  const [permissionRequest, setPermissionRequest] = (0, import_react6.useState)(null);
-  const [streamingText, setStreamingText] = (0, import_react6.useState)("");
-  const [activeTools, setActiveTools] = (0, import_react6.useState)([]);
-  const permissionQueueRef = (0, import_react6.useRef)([]);
-  const processingRef = (0, import_react6.useRef)(false);
-  const processNextPermission = (0, import_react6.useCallback)(() => {
-    if (processingRef.current) return;
-    const next = permissionQueueRef.current[0];
-    if (!next) {
-      setPermissionRequest(null);
-      return;
-    }
-    processingRef.current = true;
-    setPermissionRequest({
-      toolName: next.toolName,
-      toolArgs: next.toolArgs,
-      resolve: (result) => {
-        permissionQueueRef.current.shift();
-        processingRef.current = false;
-        setPermissionRequest(null);
-        next.resolve(result);
-        setTimeout(() => processNextPermission(), 0);
-      }
-    });
-  }, []);
-  const sessionRef = (0, import_react6.useRef)(null);
-  if (sessionRef.current === null) {
-    const permissionHandler = (toolName, toolArgs) => {
-      return new Promise((resolve) => {
-        permissionQueueRef.current.push({ toolName, toolArgs, resolve });
-        processNextPermission();
-      });
-    };
-    const onTextDelta = (delta) => {
-      setStreamingText((prev) => prev + delta);
-    };
-    const TOOL_ARG_DISPLAY_MAX = 80;
-    const TOOL_ARG_TRUNCATE_AT = 77;
-    const onToolExecution = (event) => {
-      if (event.type === "start") {
-        let firstArg = "";
-        if (event.toolArgs) {
-          const firstVal = Object.values(event.toolArgs)[0];
-          const raw = typeof firstVal === "string" ? firstVal : JSON.stringify(firstVal ?? "");
-          firstArg = raw.length > TOOL_ARG_DISPLAY_MAX ? raw.slice(0, TOOL_ARG_TRUNCATE_AT) + "..." : raw;
-        }
-        setActiveTools((prev) => [...prev, { toolName: event.toolName, firstArg, isRunning: true }]);
-      } else {
-        setActiveTools(
-          (prev) => prev.map(
-            (t) => t.toolName === event.toolName && t.isRunning ? { ...t, isRunning: false } : t
-          )
-        );
-      }
-    };
-    const paths = (0, import_agent_sdk.projectPaths)(props.cwd ?? process.cwd());
-    sessionRef.current = (0, import_agent_sdk.createSession)({
-      config: props.config,
-      context: props.context,
-      terminal: NOOP_TERMINAL,
-      sessionLogger: new import_agent_sdk.FileSessionLogger(paths.logs),
-      projectInfo: props.projectInfo,
-      sessionStore: props.sessionStore,
-      permissionMode: props.permissionMode,
-      maxTurns: props.maxTurns,
-      permissionHandler,
-      onTextDelta,
-      onToolExecution
-    });
-  }
-  const clearStreamingText = (0, import_react6.useCallback)(() => {
-    setStreamingText("");
-    setActiveTools([]);
-  }, []);
-  return { session: sessionRef.current, permissionRequest, streamingText, clearStreamingText, activeTools };
-}
-function useMessages() {
-  const [messages, setMessages] = (0, import_react6.useState)([]);
-  const addMessage = (0, import_react6.useCallback)((msg) => {
-    setMessages((prev) => [...prev, { ...msg, id: nextId(), timestamp: /* @__PURE__ */ new Date() }]);
-  }, []);
-  return { messages, setMessages, addMessage };
-}
-var EXIT_DELAY_MS = 500;
-function useSlashCommands(session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId) {
-  return (0, import_react6.useCallback)(
-    async (input) => {
-      const parts = input.slice(1).split(/\s+/);
-      const cmd = parts[0]?.toLowerCase() ?? "";
-      const args = parts.slice(1).join(" ");
-      const clearMessages = () => setMessages([]);
-      const result = await executeSlashCommand(cmd, args, session, addMessage, clearMessages, registry);
-      if (result.pendingModelId) {
-        pendingModelChangeRef.current = result.pendingModelId;
-        setPendingModelId(result.pendingModelId);
-      }
-      if (result.exitRequested) {
-        setTimeout(() => exit(), EXIT_DELAY_MS);
-      }
-      return result.handled;
-    },
-    [session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId]
-  );
-}
-function syncContextState(session, setter) {
-  const ctx = session.getContextState();
-  setter({ percentage: ctx.usedPercentage, usedTokens: ctx.usedTokens, maxTokens: ctx.maxTokens });
-}
-async function runSessionPrompt(prompt, session, addMessage, clearStreamingText, setIsThinking, setContextState) {
-  setIsThinking(true);
-  clearStreamingText();
-  const historyBefore = session.getHistory().length;
-  try {
-    const response = await session.run(prompt);
-    clearStreamingText();
-    const history = session.getHistory();
-    const toolLines = extractToolCalls(
-      history,
-      historyBefore
-    );
-    if (toolLines.length > 0) {
-      addMessage({ role: "tool", content: toolLines.join("\n"), toolName: `${toolLines.length} tools` });
-    }
-    addMessage({ role: "assistant", content: response || "(empty response)" });
-    syncContextState(session, setContextState);
-  } catch (err) {
-    clearStreamingText();
-    if (err instanceof DOMException && err.name === "AbortError") {
-      addMessage({ role: "system", content: "Cancelled." });
-    } else {
-      const errMsg = err instanceof Error ? err.message : String(err);
-      addMessage({ role: "system", content: `Error: ${errMsg}` });
-    }
-  } finally {
-    setIsThinking(false);
-  }
-}
-function buildSkillPrompt(input, registry) {
-  const parts = input.slice(1).split(/\s+/);
-  const cmd = parts[0]?.toLowerCase() ?? "";
-  const skillCmd = registry.getCommands().find((c) => c.name === cmd && c.source === "skill");
-  if (!skillCmd) return null;
-  const args = parts.slice(1).join(" ").trim();
-  const userInstruction = args || skillCmd.description;
-  if (skillCmd.skillContent) {
-    return `<skill name="${cmd}">
-${skillCmd.skillContent}
-</skill>
-
-Execute the "${cmd}" skill: ${userInstruction}`;
-  }
-  return `Use the "${cmd}" skill: ${userInstruction}`;
-}
-function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamingText, setIsThinking, setContextState, registry) {
-  return (0, import_react6.useCallback)(
-    async (input) => {
-      if (input.startsWith("/")) {
-        const handled = await handleSlashCommand(input);
-        if (handled) {
-          syncContextState(session, setContextState);
-          return;
-        }
-        const prompt = buildSkillPrompt(input, registry);
-        if (!prompt) return;
-        return runSessionPrompt(
-          prompt,
-          session,
-          addMessage,
-          clearStreamingText,
-          setIsThinking,
-          setContextState
-        );
-      }
-      addMessage({ role: "user", content: input });
-      return runSessionPrompt(
-        input,
-        session,
-        addMessage,
-        clearStreamingText,
-        setIsThinking,
-        setContextState
-      );
-    },
-    [
-      session,
-      addMessage,
-      handleSlashCommand,
-      clearStreamingText,
-      setIsThinking,
-      setContextState,
-      registry
-    ]
-  );
-}
-function useCommandRegistry(cwd) {
-  const registryRef = (0, import_react6.useRef)(null);
-  if (registryRef.current === null) {
-    const registry = new CommandRegistry();
-    registry.addSource(new BuiltinCommandSource());
-    registry.addSource(new SkillCommandSource(cwd));
-    registryRef.current = registry;
-  }
-  return registryRef.current;
-}
+var EXIT_DELAY_MS2 = 500;
 function App(props) {
   const { exit } = (0, import_ink10.useApp)();
   const { session, permissionRequest, streamingText, clearStreamingText, activeTools } = useSession(props);
   const { messages, setMessages, addMessage } = useMessages();
-  const [isThinking, setIsThinking] = (0, import_react6.useState)(false);
-  const [contextState, setContextState] = (0, import_react6.useState)({ percentage: 0, usedTokens: 0, maxTokens: 0 });
+  const [isThinking, setIsThinking] = (0, import_react11.useState)(false);
+  const initialCtx = session.getContextState();
+  const [contextState, setContextState] = (0, import_react11.useState)({
+    percentage: initialCtx.usedPercentage,
+    usedTokens: initialCtx.usedTokens,
+    maxTokens: initialCtx.maxTokens
+  });
   const registry = useCommandRegistry(props.cwd ?? process.cwd());
-  const pendingModelChangeRef = (0, import_react6.useRef)(null);
-  const [pendingModelId, setPendingModelId] = (0, import_react6.useState)(null);
+  const pendingModelChangeRef = (0, import_react11.useRef)(null);
+  const [pendingModelId, setPendingModelId] = (0, import_react11.useState)(null);
   const handleSlashCommand = useSlashCommands(session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId);
   const handleSubmit = useSubmitHandler(
     session,
@@ -1317,7 +1322,7 @@ function App(props) {
               const settingsPath = getUserSettingsPath();
               updateModelInSettings(settingsPath, pendingModelId);
               addMessage({ role: "system", content: `Model changed to ${(0, import_agent_core3.getModelName)(pendingModelId)}. Restarting...` });
-              setTimeout(() => exit(), 500);
+              setTimeout(() => exit(), EXIT_DELAY_MS2);
             } catch (err) {
               addMessage({ role: "system", content: `Failed: ${err instanceof Error ? err.message : String(err)}` });
             }