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

package/dist/node/bin.cjs

@@ -24,22 +24,273 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/cli.ts
-var import_node_util = require("util");
 var import_node_fs3 = require("fs");
 var import_node_path3 = require("path");
 var import_node_url = require("url");
-var readline = __toESM(require("readline"), 1);
 var import_agent_sdk2 = require("@robota-sdk/agent-sdk");
 var import_agent_sdk3 = require("@robota-sdk/agent-sdk");
 
+// src/utils/cli-args.ts
+var import_node_util = require("util");
+var VALID_MODES = ["plan", "default", "acceptEdits", "bypassPermissions"];
+function parsePermissionMode(raw) {
+  if (raw === void 0) return void 0;
+  if (!VALID_MODES.includes(raw)) {
+    process.stderr.write(`Invalid --permission-mode "${raw}". Valid: ${VALID_MODES.join(" | ")}
+`);
+    process.exit(1);
+  }
+  return raw;
+}
+function parseMaxTurns(raw) {
+  if (raw === void 0) return void 0;
+  const n = parseInt(raw, 10);
+  if (isNaN(n) || n <= 0) {
+    process.stderr.write(`Invalid --max-turns "${raw}". Must be a positive integer.
+`);
+    process.exit(1);
+  }
+  return n;
+}
+function parseCliArgs() {
+  const { values, positionals } = (0, import_node_util.parseArgs)({
+    allowPositionals: true,
+    options: {
+      p: { type: "boolean", short: "p", default: false },
+      c: { type: "boolean", short: "c", default: false },
+      r: { type: "string", short: "r" },
+      model: { type: "string" },
+      "permission-mode": { type: "string" },
+      "max-turns": { type: "string" },
+      version: { type: "boolean", default: false },
+      reset: { type: "boolean", default: false }
+    }
+  });
+  return {
+    positional: positionals,
+    printMode: values["p"] ?? false,
+    continueMode: values["c"] ?? false,
+    resumeId: values["r"],
+    model: values["model"],
+    permissionMode: parsePermissionMode(values["permission-mode"]),
+    maxTurns: parseMaxTurns(values["max-turns"]),
+    version: values["version"] ?? false,
+    reset: values["reset"] ?? false
+  };
+}
+
+// src/utils/settings-io.ts
+var import_node_fs = require("fs");
+var import_node_path = require("path");
+function getUserSettingsPath() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "/";
+  return (0, import_node_path.join)(home, ".robota", "settings.json");
+}
+function readSettings(path) {
+  if (!(0, import_node_fs.existsSync)(path)) return {};
+  return JSON.parse((0, import_node_fs.readFileSync)(path, "utf8"));
+}
+function writeSettings(path, settings) {
+  (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(path), { recursive: true });
+  (0, import_node_fs.writeFileSync)(path, JSON.stringify(settings, null, 2) + "\n", "utf8");
+}
+function updateModelInSettings(settingsPath, modelId) {
+  const settings = readSettings(settingsPath);
+  const provider = settings.provider ?? {};
+  provider.model = modelId;
+  settings.provider = provider;
+  writeSettings(settingsPath, settings);
+}
+function deleteSettings(path) {
+  if ((0, import_node_fs.existsSync)(path)) {
+    (0, import_node_fs.unlinkSync)(path);
+    return true;
+  }
+  return false;
+}
+
+// src/print-terminal.ts
+var readline = __toESM(require("readline"), 1);
+var PrintTerminal = class {
+  write(text) {
+    process.stdout.write(text);
+  }
+  writeLine(text) {
+    process.stdout.write(text + "\n");
+  }
+  writeMarkdown(md) {
+    process.stdout.write(md);
+  }
+  writeError(text) {
+    process.stderr.write(text + "\n");
+  }
+  prompt(question) {
+    return new Promise((resolve) => {
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+        terminal: false,
+        historySize: 0
+      });
+      rl.question(question, (answer) => {
+        rl.close();
+        resolve(answer);
+      });
+    });
+  }
+  async select(options, initialIndex = 0) {
+    for (let i = 0; i < options.length; i++) {
+      const marker = i === initialIndex ? ">" : " ";
+      process.stdout.write(`  ${marker} ${i + 1}) ${options[i]}
+`);
+    }
+    const answer = await this.prompt(
+      `  Choose [1-${options.length}] (default: ${options[initialIndex]}): `
+    );
+    const trimmed = answer.trim().toLowerCase();
+    if (trimmed === "") return initialIndex;
+    const num = parseInt(trimmed, 10);
+    if (!isNaN(num) && num >= 1 && num <= options.length) return num - 1;
+    return initialIndex;
+  }
+  spinner(_message) {
+    return { stop() {
+    }, update() {
+    } };
+  }
+};
+
 // src/ui/render.tsx
-var import_ink10 = require("ink");
+var import_ink11 = require("ink");
 
 // src/ui/App.tsx
 var import_react6 = require("react");
-var import_ink9 = require("ink");
-var import_node_fs2 = require("fs");
-var import_node_path2 = require("path");
+var import_ink10 = require("ink");
+
+// src/commands/slash-executor.ts
+var VALID_MODES2 = ["plan", "default", "acceptEdits", "bypassPermissions"];
+var HELP_TEXT = [
+  "Available commands:",
+  "  /help              \u2014 Show this help",
+  "  /clear             \u2014 Clear conversation",
+  "  /compact [instr]   \u2014 Compact context (optional focus instructions)",
+  "  /mode [m]          \u2014 Show/change permission mode",
+  "  /cost              \u2014 Show session info",
+  "  /reset             \u2014 Delete settings and exit",
+  "  /exit              \u2014 Exit CLI"
+].join("\n");
+function handleHelp(addMessage) {
+  addMessage({ role: "system", content: HELP_TEXT });
+  return { handled: true };
+}
+function handleClear(addMessage, clearMessages, session) {
+  clearMessages();
+  session.clearHistory();
+  addMessage({ role: "system", content: "Conversation cleared." });
+  return { handled: true };
+}
+async function handleCompact(args, session, addMessage) {
+  const instructions = args.trim() || void 0;
+  const before = session.getContextState().usedPercentage;
+  addMessage({ role: "system", content: "Compacting context..." });
+  await session.compact(instructions);
+  const after = session.getContextState().usedPercentage;
+  addMessage({
+    role: "system",
+    content: `Context compacted: ${Math.round(before)}% -> ${Math.round(after)}%`
+  });
+  return { handled: true };
+}
+function handleMode(arg, session, addMessage) {
+  if (!arg) {
+    addMessage({ role: "system", content: `Current mode: ${session.getPermissionMode()}` });
+  } else if (VALID_MODES2.includes(arg)) {
+    session.setPermissionMode(arg);
+    addMessage({ role: "system", content: `Permission mode set to: ${arg}` });
+  } else {
+    addMessage({ role: "system", content: `Invalid mode. Valid: ${VALID_MODES2.join(" | ")}` });
+  }
+  return { handled: true };
+}
+function handleModel(modelId, addMessage) {
+  if (!modelId) {
+    addMessage({ role: "system", content: "Select a model from the /model submenu." });
+    return { handled: true };
+  }
+  return { handled: true, pendingModelId: modelId };
+}
+function handleCost(session, addMessage) {
+  addMessage({
+    role: "system",
+    content: `Session: ${session.getSessionId()}
+Messages: ${session.getMessageCount()}`
+  });
+  return { handled: true };
+}
+function handlePermissions(session, addMessage) {
+  const mode = session.getPermissionMode();
+  const sessionAllowed = session.getSessionAllowedTools();
+  const lines = [`Permission mode: ${mode}`];
+  if (sessionAllowed.length > 0) {
+    lines.push(`Session-approved tools: ${sessionAllowed.join(", ")}`);
+  } else {
+    lines.push("No session-approved tools.");
+  }
+  addMessage({ role: "system", content: lines.join("\n") });
+  return { handled: true };
+}
+function handleContext(session, addMessage) {
+  const ctx = session.getContextState();
+  addMessage({
+    role: "system",
+    content: `Context: ${ctx.usedTokens.toLocaleString()} / ${ctx.maxTokens.toLocaleString()} tokens (${Math.round(ctx.usedPercentage)}%)`
+  });
+  return { handled: true };
+}
+function handleReset(addMessage) {
+  const settingsPath = getUserSettingsPath();
+  if (deleteSettings(settingsPath)) {
+    addMessage({ role: "system", content: `Deleted ${settingsPath}. Exiting...` });
+  } else {
+    addMessage({ role: "system", content: "No user settings found." });
+  }
+  return { handled: true, exitRequested: true };
+}
+async function executeSlashCommand(cmd, args, session, addMessage, clearMessages, registry) {
+  switch (cmd) {
+    case "help":
+      return handleHelp(addMessage);
+    case "clear":
+      return handleClear(addMessage, clearMessages, session);
+    case "compact":
+      return handleCompact(args, session, addMessage);
+    case "mode":
+      return handleMode(args.split(/\s+/)[0] || void 0, session, addMessage);
+    case "model":
+      return handleModel(args.split(/\s+/)[0] || void 0, addMessage);
+    case "cost":
+      return handleCost(session, addMessage);
+    case "permissions":
+      return handlePermissions(session, addMessage);
+    case "context":
+      return handleContext(session, addMessage);
+    case "reset":
+      return handleReset(addMessage);
+    case "exit":
+      return { handled: true, exitRequested: true };
+    default: {
+      const skillCmd = registry.getCommands().find((c) => c.name === cmd && c.source === "skill");
+      if (skillCmd) {
+        addMessage({ role: "system", content: `Invoking skill: ${cmd}` });
+        return { handled: false };
+      }
+      addMessage({ role: "system", content: `Unknown command "/${cmd}". Type /help for help.` });
+      return { handled: true };
+    }
+  }
+}
+
+// src/ui/App.tsx
 var import_agent_sdk = require("@robota-sdk/agent-sdk");
 var import_agent_core3 = require("@robota-sdk/agent-core");
 
@@ -130,8 +381,8 @@ var BuiltinCommandSource = class {
 };
 
 // src/commands/skill-source.ts
-var import_node_fs = require("fs");
-var import_node_path = require("path");
+var import_node_fs2 = require("fs");
+var import_node_path2 = require("path");
 var import_node_os = require("os");
 function parseFrontmatter(content) {
   const lines = content.split("\n");
@@ -154,14 +405,14 @@ function parseFrontmatter(content) {
   return name ? { name, description } : null;
 }
 function scanSkillsDir(skillsDir) {
-  if (!(0, import_node_fs.existsSync)(skillsDir)) return [];
+  if (!(0, import_node_fs2.existsSync)(skillsDir)) return [];
   const commands = [];
-  const entries = (0, import_node_fs.readdirSync)(skillsDir, { withFileTypes: true });
+  const entries = (0, import_node_fs2.readdirSync)(skillsDir, { withFileTypes: true });
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const skillFile = (0, import_node_path.join)(skillsDir, entry.name, "SKILL.md");
-    if (!(0, import_node_fs.existsSync)(skillFile)) continue;
-    const content = (0, import_node_fs.readFileSync)(skillFile, "utf-8");
+    const skillFile = (0, import_node_path2.join)(skillsDir, entry.name, "SKILL.md");
+    if (!(0, import_node_fs2.existsSync)(skillFile)) continue;
+    const content = (0, import_node_fs2.readFileSync)(skillFile, "utf-8");
     const frontmatter = parseFrontmatter(content);
     commands.push({
       name: frontmatter?.name ?? entry.name,
@@ -181,8 +432,8 @@ var SkillCommandSource = class {
   }
   getCommands() {
     if (this.cachedCommands) return this.cachedCommands;
-    const projectSkills = scanSkillsDir((0, import_node_path.join)(this.cwd, ".agents", "skills"));
-    const userSkills = scanSkillsDir((0, import_node_path.join)((0, import_node_os.homedir)(), ".claude", "skills"));
+    const projectSkills = scanSkillsDir((0, import_node_path2.join)(this.cwd, ".agents", "skills"));
+    const userSkills = scanSkillsDir((0, import_node_path2.join)((0, import_node_os.homedir)(), ".claude", "skills"));
     const seen = new Set(projectSkills.map((cmd) => cmd.name));
     const merged = [...projectSkills];
     for (const cmd of userSkills) {
@@ -724,8 +975,66 @@ function PermissionPrompt({ request }) {
   ] });
 }
 
-// src/ui/App.tsx
+// 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");
+function StreamingIndicator({ text, activeTools }) {
+  const hasTools = activeTools.length > 0;
+  const hasText = text.length > 0;
+  if (!hasTools && !hasText) {
+    return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { color: "yellow", children: "Thinking..." });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", children: [
+    hasTools && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { color: "gray", bold: true, children: "Tools:" }),
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { children: " " }),
+      activeTools.map((t, i) => /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Text, { color: t.isRunning ? "yellow" : "green", children: [
+        "  ",
+        t.isRunning ? "\u27F3" : "\u2713",
+        " ",
+        t.toolName,
+        "(",
+        t.firstArg,
+        ")"
+      ] }, `${t.toolName}-${i}`))
+    ] }),
+    hasText && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { color: "cyan", bold: true, children: "Robota:" }),
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { children: " " }),
+      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { wrap: "wrap", children: renderMarkdown(text) }) })
+    ] })
+  ] });
+}
+
+// src/ui/App.tsx
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var msgIdCounter = 0;
 function nextId() {
   msgIdCounter += 1;
@@ -749,6 +1058,7 @@ var NOOP_TERMINAL = {
 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)(() => {
@@ -782,6 +1092,25 @@ function useSession(props) {
     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,
@@ -793,11 +1122,15 @@ function useSession(props) {
       permissionMode: props.permissionMode,
       maxTurns: props.maxTurns,
       permissionHandler,
-      onTextDelta
+      onTextDelta,
+      onToolExecution
     });
   }
-  const clearStreamingText = (0, import_react6.useCallback)(() => setStreamingText(""), []);
-  return { session: sessionRef.current, permissionRequest, streamingText, clearStreamingText };
+  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)([]);
@@ -806,139 +1139,32 @@ function useMessages() {
   }, []);
   return { messages, setMessages, addMessage };
 }
-var HELP_TEXT = [
-  "Available commands:",
-  "  /help              \u2014 Show this help",
-  "  /clear             \u2014 Clear conversation",
-  "  /compact [instr]   \u2014 Compact context (optional focus instructions)",
-  "  /mode [m]          \u2014 Show/change permission mode",
-  "  /cost              \u2014 Show session info",
-  "  /reset             \u2014 Delete settings and exit",
-  "  /exit              \u2014 Exit CLI"
-].join("\n");
-function handleModeCommand(arg, session, addMessage) {
-  const validModes = ["plan", "default", "acceptEdits", "bypassPermissions"];
-  if (!arg) {
-    addMessage({ role: "system", content: `Current mode: ${session.getPermissionMode()}` });
-  } else if (validModes.includes(arg)) {
-    session.setPermissionMode(arg);
-    addMessage({ role: "system", content: `Permission mode set to: ${arg}` });
-  } else {
-    addMessage({ role: "system", content: `Invalid mode. Valid: ${validModes.join(" | ")}` });
-  }
-  return true;
-}
-async function executeSlashCommand(cmd, parts, session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId) {
-  switch (cmd) {
-    case "help":
-      addMessage({ role: "system", content: HELP_TEXT });
-      return true;
-    case "clear":
-      setMessages([]);
-      session.clearHistory();
-      addMessage({ role: "system", content: "Conversation cleared." });
-      return true;
-    case "compact": {
-      const instructions = parts.slice(1).join(" ").trim() || void 0;
-      const before = session.getContextState().usedPercentage;
-      addMessage({ role: "system", content: "Compacting context..." });
-      await session.compact(instructions);
-      const after = session.getContextState().usedPercentage;
-      addMessage({
-        role: "system",
-        content: `Context compacted: ${Math.round(before)}% -> ${Math.round(after)}%`
-      });
-      return true;
-    }
-    case "mode":
-      return handleModeCommand(parts[1], session, addMessage);
-    case "model": {
-      const modelId = parts[1];
-      if (!modelId) {
-        addMessage({ role: "system", content: "Select a model from the /model submenu." });
-        return true;
-      }
-      pendingModelChangeRef.current = modelId;
-      setPendingModelId(modelId);
-      return true;
-    }
-    case "cost":
-      addMessage({
-        role: "system",
-        content: `Session: ${session.getSessionId()}
-Messages: ${session.getMessageCount()}`
-      });
-      return true;
-    case "permissions": {
-      const mode = session.getPermissionMode();
-      const sessionAllowed = session.getSessionAllowedTools();
-      const lines = [`Permission mode: ${mode}`];
-      if (sessionAllowed.length > 0) {
-        lines.push(`Session-approved tools: ${sessionAllowed.join(", ")}`);
-      } else {
-        lines.push("No session-approved tools.");
-      }
-      addMessage({ role: "system", content: lines.join("\n") });
-      return true;
-    }
-    case "context": {
-      const ctx = session.getContextState();
-      addMessage({
-        role: "system",
-        content: `Context: ${ctx.usedTokens.toLocaleString()} / ${ctx.maxTokens.toLocaleString()} tokens (${Math.round(ctx.usedPercentage)}%)`
-      });
-      return true;
-    }
-    case "reset": {
-      const home = process.env.HOME ?? process.env.USERPROFILE ?? "/";
-      const settingsPath = `${home}/.robota/settings.json`;
-      if ((0, import_node_fs2.existsSync)(settingsPath)) {
-        (0, import_node_fs2.unlinkSync)(settingsPath);
-        addMessage({ role: "system", content: `Deleted ${settingsPath}. Exiting...` });
-      } else {
-        addMessage({ role: "system", content: "No user settings found." });
-      }
-      setTimeout(() => exit(), 500);
-      return true;
-    }
-    case "exit":
-      exit();
-      return true;
-    default: {
-      const skillCmd = registry.getCommands().find((c) => c.name === cmd && c.source === "skill");
-      if (skillCmd) {
-        addMessage({ role: "system", content: `Invoking skill: ${cmd}` });
-        return false;
-      }
-      addMessage({ role: "system", content: `Unknown command "/${cmd}". Type /help for help.` });
-      return true;
-    }
-  }
-}
+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() ?? "";
-      return executeSlashCommand(cmd, parts, session, addMessage, setMessages, exit, registry, pendingModelChangeRef, setPendingModelId);
+      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 StreamingIndicator({ text }) {
-  if (text) {
-    return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Text, { color: "cyan", bold: true, children: [
-        "Robota:",
-        " "
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { children: " " }),
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Box, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { wrap: "wrap", children: renderMarkdown(text) }) })
-    ] });
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { color: "yellow", children: "Thinking..." });
+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, setContextPercentage) {
+async function runSessionPrompt(prompt, session, addMessage, clearStreamingText, setIsThinking, setContextState) {
   setIsThinking(true);
   clearStreamingText();
   const historyBefore = session.getHistory().length;
@@ -946,29 +1172,15 @@ async function runSessionPrompt(prompt, session, addMessage, clearStreamingText,
     const response = await session.run(prompt);
     clearStreamingText();
     const history = session.getHistory();
-    const toolLines = [];
-    for (let i = historyBefore; i < history.length; i++) {
-      const msg = history[i];
-      if (msg.role === "assistant" && msg.toolCalls) {
-        for (const tc of msg.toolCalls) {
-          let value = "";
-          try {
-            const parsed = JSON.parse(tc.function.arguments);
-            const firstVal = Object.values(parsed)[0];
-            value = typeof firstVal === "string" ? firstVal : JSON.stringify(firstVal);
-          } catch {
-            value = tc.function.arguments;
-          }
-          const truncated = value.length > 80 ? value.slice(0, 77) + "..." : value;
-          toolLines.push(`${tc.function.name}(${truncated})`);
-        }
-      }
-    }
+    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)" });
-    setContextPercentage(session.getContextState().usedPercentage);
+    syncContextState(session, setContextState);
   } catch (err) {
     clearStreamingText();
     if (err instanceof DOMException && err.name === "AbortError") {
@@ -997,13 +1209,13 @@ Execute the "${cmd}" skill: ${userInstruction}`;
   }
   return `Use the "${cmd}" skill: ${userInstruction}`;
 }
-function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamingText, setIsThinking, setContextPercentage, registry) {
+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) {
-          setContextPercentage(session.getContextState().usedPercentage);
+          syncContextState(session, setContextState);
           return;
         }
         const prompt = buildSkillPrompt(input, registry);
@@ -1014,7 +1226,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
           addMessage,
           clearStreamingText,
           setIsThinking,
-          setContextPercentage
+          setContextState
         );
       }
       addMessage({ role: "user", content: input });
@@ -1024,7 +1236,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
         addMessage,
         clearStreamingText,
         setIsThinking,
-        setContextPercentage
+        setContextState
       );
     },
     [
@@ -1033,7 +1245,7 @@ function useSubmitHandler(session, addMessage, handleSlashCommand, clearStreamin
       handleSlashCommand,
       clearStreamingText,
       setIsThinking,
-      setContextPercentage,
+      setContextState,
       registry
     ]
   );
@@ -1049,11 +1261,11 @@ function useCommandRegistry(cwd) {
   return registryRef.current;
 }
 function App(props) {
-  const { exit } = (0, import_ink9.useApp)();
-  const { session, permissionRequest, streamingText, clearStreamingText } = useSession(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 [contextPercentage, setContextPercentage] = (0, import_react6.useState)(0);
+  const [contextState, setContextState] = (0, import_react6.useState)({ percentage: 0, usedTokens: 0, maxTokens: 0 });
   const registry = useCommandRegistry(props.cwd ?? process.cwd());
   const pendingModelChangeRef = (0, import_react6.useRef)(null);
   const [pendingModelId, setPendingModelId] = (0, import_react6.useState)(null);
@@ -1064,36 +1276,36 @@ function App(props) {
     handleSlashCommand,
     clearStreamingText,
     setIsThinking,
-    setContextPercentage,
+    setContextState,
     registry
   );
-  (0, import_ink9.useInput)(
+  (0, import_ink10.useInput)(
     (_input, key) => {
       if (key.ctrl && _input === "c") exit();
       if (key.escape && isThinking) session.abort();
     },
     { isActive: !permissionRequest }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { color: "cyan", bold: true, children: `
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_ink10.Text, { color: "cyan", bold: true, children: `
   ____   ___  ____   ___ _____  _
  |  _ \\ / _ \\| __ ) / _ \\_   _|/ \\
  | |_) | | | |  _ \\| | | || | / _ \\
  |  _ <| |_| | |_) | |_| || |/ ___ \\
  |_| \\_\\\\___/|____/ \\___/ |_/_/   \\_\\
 ` }),
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Text, { dimColor: true, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Text, { dimColor: true, children: [
         " v",
         props.version ?? "0.0.0"
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_ink9.Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(MessageList, { messages }),
-      isThinking && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(StreamingIndicator, { text: streamingText }) })
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_ink10.Box, { flexDirection: "column", paddingX: 1, flexGrow: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(MessageList, { messages }),
+      isThinking && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_ink10.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(StreamingIndicator, { text: streamingText, activeTools }) })
     ] }),
-    permissionRequest && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(PermissionPrompt, { request: permissionRequest }),
-    pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    permissionRequest && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(PermissionPrompt, { request: permissionRequest }),
+    pendingModelId && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
       ConfirmPrompt,
       {
         message: `Change model to ${(0, import_agent_core3.getModelName)(pendingModelId)}? This will restart the session.`,
@@ -1102,17 +1314,8 @@ function App(props) {
           pendingModelChangeRef.current = null;
           if (index === 0) {
             try {
-              const home = process.env.HOME ?? process.env.USERPROFILE ?? "/";
-              const settingsPath = (0, import_node_path2.join)(home, ".robota", "settings.json");
-              let settings = {};
-              if ((0, import_node_fs2.existsSync)(settingsPath)) {
-                settings = JSON.parse((0, import_node_fs2.readFileSync)(settingsPath, "utf8"));
-              }
-              const provider = settings.provider ?? {};
-              provider.model = pendingModelId;
-              settings.provider = provider;
-              (0, import_node_fs2.mkdirSync)((0, import_node_path2.join)(home, ".robota"), { recursive: true });
-              (0, import_node_fs2.writeFileSync)(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf8");
+              const settingsPath = getUserSettingsPath();
+              updateModelInSettings(settingsPath, pendingModelId);
               addMessage({ role: "system", content: `Model changed to ${(0, import_agent_core3.getModelName)(pendingModelId)}. Restarting...` });
               setTimeout(() => exit(), 500);
             } catch (err) {
@@ -1124,7 +1327,7 @@ function App(props) {
         }
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
       StatusBar,
       {
         permissionMode: session.getPermissionMode(),
@@ -1132,12 +1335,12 @@ function App(props) {
         sessionId: session.getSessionId(),
         messageCount: messages.length,
         isThinking,
-        contextPercentage,
-        contextUsedTokens: session.getContextState().usedTokens,
-        contextMaxTokens: session.getContextState().maxTokens
+        contextPercentage: contextState.percentage,
+        contextUsedTokens: contextState.usedTokens,
+        contextMaxTokens: contextState.maxTokens
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
       InputArea,
       {
         onSubmit: handleSubmit,
@@ -1145,12 +1348,12 @@ function App(props) {
         registry
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_ink9.Text, { children: " " })
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_ink10.Text, { children: " " })
   ] });
 }
 
 // src/ui/render.tsx
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 function renderApp(options) {
   process.on("unhandledRejection", (reason) => {
     process.stderr.write(`
@@ -1161,7 +1364,7 @@ function renderApp(options) {
 `);
     }
   });
-  const instance = (0, import_ink10.render)(/* @__PURE__ */ (0, import_jsx_runtime10.jsx)(App, { ...options }), {
+  const instance = (0, import_ink11.render)(/* @__PURE__ */ (0, import_jsx_runtime11.jsx)(App, { ...options }), {
     exitOnCtrlC: true
   });
   instance.waitUntilExit().catch((err) => {
@@ -1175,7 +1378,18 @@ function renderApp(options) {
 
 // src/cli.ts
 var import_meta = {};
-var VALID_MODES = ["plan", "default", "acceptEdits", "bypassPermissions"];
+function hasValidSettingsFile(filePath) {
+  if (!(0, import_node_fs3.existsSync)(filePath)) return false;
+  try {
+    const raw = (0, import_node_fs3.readFileSync)(filePath, "utf8").trim();
+    if (raw.length === 0) return false;
+    const parsed = JSON.parse(raw);
+    const provider = parsed.provider;
+    return !!provider?.apiKey;
+  } catch {
+    return false;
+  }
+}
 function readVersion() {
   try {
     const thisFile = (0, import_node_url.fileURLToPath)(import_meta.url);
@@ -1196,108 +1410,11 @@ function readVersion() {
     return "0.0.0";
   }
 }
-function parsePermissionMode(raw) {
-  if (raw === void 0) return void 0;
-  if (!VALID_MODES.includes(raw)) {
-    process.stderr.write(`Invalid --permission-mode "${raw}". Valid: ${VALID_MODES.join(" | ")}
-`);
-    process.exit(1);
-  }
-  return raw;
-}
-function parseMaxTurns(raw) {
-  if (raw === void 0) return void 0;
-  const n = parseInt(raw, 10);
-  if (isNaN(n) || n <= 0) {
-    process.stderr.write(`Invalid --max-turns "${raw}". Must be a positive integer.
-`);
-    process.exit(1);
-  }
-  return n;
-}
-function parseCliArgs() {
-  const { values, positionals } = (0, import_node_util.parseArgs)({
-    allowPositionals: true,
-    options: {
-      p: { type: "boolean", short: "p", default: false },
-      c: { type: "boolean", short: "c", default: false },
-      r: { type: "string", short: "r" },
-      model: { type: "string" },
-      "permission-mode": { type: "string" },
-      "max-turns": { type: "string" },
-      version: { type: "boolean", default: false },
-      reset: { type: "boolean", default: false }
-    }
-  });
-  return {
-    positional: positionals,
-    printMode: values["p"] ?? false,
-    continueMode: values["c"] ?? false,
-    resumeId: values["r"],
-    model: values["model"],
-    permissionMode: parsePermissionMode(values["permission-mode"]),
-    maxTurns: parseMaxTurns(values["max-turns"]),
-    version: values["version"] ?? false,
-    reset: values["reset"] ?? false
-  };
-}
-var PrintTerminal = class {
-  write(text) {
-    process.stdout.write(text);
-  }
-  writeLine(text) {
-    process.stdout.write(text + "\n");
-  }
-  writeMarkdown(md) {
-    process.stdout.write(md);
-  }
-  writeError(text) {
-    process.stderr.write(text + "\n");
-  }
-  prompt(question) {
-    return new Promise((resolve) => {
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-        terminal: false,
-        historySize: 0
-      });
-      rl.question(question, (answer) => {
-        rl.close();
-        resolve(answer);
-      });
-    });
-  }
-  async select(options, initialIndex = 0) {
-    for (let i = 0; i < options.length; i++) {
-      const marker = i === initialIndex ? ">" : " ";
-      process.stdout.write(`  ${marker} ${i + 1}) ${options[i]}
-`);
-    }
-    const answer = await this.prompt(
-      `  Choose [1-${options.length}] (default: ${options[initialIndex]}): `
-    );
-    const trimmed = answer.trim().toLowerCase();
-    if (trimmed === "") return initialIndex;
-    const num = parseInt(trimmed, 10);
-    if (!isNaN(num) && num >= 1 && num <= options.length) return num - 1;
-    return initialIndex;
-  }
-  spinner(_message) {
-    return { stop() {
-    }, update() {
-    } };
-  }
-};
-function getUserSettingsPath() {
-  const home = process.env.HOME ?? process.env.USERPROFILE ?? "/";
-  return (0, import_node_path3.join)(home, ".robota", "settings.json");
-}
 async function ensureConfig(cwd) {
   const userPath = getUserSettingsPath();
   const projectPath = (0, import_node_path3.join)(cwd, ".robota", "settings.json");
   const localPath = (0, import_node_path3.join)(cwd, ".robota", "settings.local.json");
-  if ((0, import_node_fs3.existsSync)(userPath) || (0, import_node_fs3.existsSync)(projectPath) || (0, import_node_fs3.existsSync)(localPath)) {
+  if (hasValidSettingsFile(userPath) || hasValidSettingsFile(projectPath) || hasValidSettingsFile(localPath)) {
     return;
   }
   process.stdout.write("\n");
@@ -1358,8 +1475,7 @@ async function ensureConfig(cwd) {
 }
 function resetConfig() {
   const userPath = getUserSettingsPath();
-  if ((0, import_node_fs3.existsSync)(userPath)) {
-    (0, import_node_fs3.unlinkSync)(userPath);
+  if (deleteSettings(userPath)) {
     process.stdout.write(`Deleted ${userPath}
 `);
   } else {