@menteeai/menteeswe 0.1.5 → 0.1.9

package/dist/cli.js

@@ -96,6 +96,102 @@ var init_base = __esm({
   }
 });
 
+// src/tools/exec.ts
+import { spawn } from "child_process";
+function killTree(child) {
+  if (child.pid === void 0) return;
+  if (process.platform === "win32") {
+    spawn(`taskkill /pid ${String(child.pid)} /T /F`, { stdio: "ignore", shell: true });
+  } else {
+    child.kill("SIGKILL");
+  }
+}
+function killActiveChild() {
+  if (!activeChild) return;
+  try {
+    activeChild.kill("SIGKILL");
+  } catch {
+  }
+  killTree(activeChild);
+}
+async function runShellCommand(command, cwd, timeoutMs = 12e4, maxChars = 1e5) {
+  return new Promise((resolve) => {
+    const started = Date.now();
+    const child = spawn(command, {
+      shell: true,
+      cwd,
+      env: { ...process.env, MENTEE: "1" },
+      windowsHide: true
+    });
+    activeChild = child;
+    let stdout = "";
+    let stderr = "";
+    let killed = false;
+    const timer = setTimeout(() => {
+      killed = true;
+      killTree(child);
+    }, timeoutMs);
+    child.stdout?.on("data", (chunk) => {
+      if (stdout.length < maxChars * 2) stdout += chunk.toString("utf8");
+    });
+    child.stderr?.on("data", (chunk) => {
+      if (stderr.length < maxChars * 2) stderr += chunk.toString("utf8");
+    });
+    child.on("error", (error) => {
+      clearTimeout(timer);
+      if (activeChild === child) activeChild = null;
+      resolve({
+        exitCode: -1,
+        stdout,
+        stderr: `${stderr}
+${error.message}`.trim(),
+        durationMs: Date.now() - started
+      });
+    });
+    child.on("close", (code) => {
+      clearTimeout(timer);
+      if (activeChild === child) activeChild = null;
+      resolve({
+        exitCode: killed ? "timeout" : code ?? -1,
+        stdout,
+        stderr,
+        durationMs: Date.now() - started
+      });
+    });
+  });
+}
+function formatOutcome(outcome, maxChars = 1e5) {
+  const cut = (text, limit) => {
+    if (text.length <= limit) return { text, truncated: false };
+    const head = Math.floor(limit * 0.7);
+    return {
+      text: `${text.slice(0, head)}
+...[truncated, ${text.length - head} chars removed]...`,
+      truncated: true
+    };
+  };
+  const out = cut(outcome.stdout.trim(), maxChars);
+  const err = cut(outcome.stderr.trim(), Math.floor(maxChars / 2));
+  const sections = [`exit_code: ${outcome.exitCode}`, `duration_ms: ${outcome.durationMs}`];
+  if (out.text) sections.push(`stdout:
+${out.text}`);
+  if (err.text) sections.push(`stderr:
+${err.text}`);
+  if (!out.text && !err.text) sections.push("(no output)");
+  return {
+    output: sections.join("\n"),
+    success: outcome.exitCode === 0,
+    truncated: out.truncated || err.truncated
+  };
+}
+var activeChild;
+var init_exec = __esm({
+  "src/tools/exec.ts"() {
+    "use strict";
+    activeChild = null;
+  }
+});
+
 // src/events.ts
 var EventBus;
 var init_events = __esm({
@@ -155,17 +251,17 @@ function friendlyToolName(name) {
 function formatEvent(event) {
   switch (event.type) {
     case "task_started":
-      return chalk.bold.magenta(`\u25B8 Task: ${event.message ?? ""}`);
+      return "\n" + chalk.bold.magenta(`\u25B8  Task: ${event.message ?? ""}`);
     case "model_request":
-      return chalk.gray("\u25CF thinking...");
+      return chalk.gray("\u25CF  thinking...");
     case "info":
-      return chalk.cyan(`  ${event.message ?? ""}`);
+      return chalk.cyan.bold(`\u{1F4AD}  ${event.message ?? ""}`);
     case "tool_started": {
       const tool = typeof event.data?.tool === "string" ? event.data.tool : "";
       const color = CATEGORY_COLOR[TOOL_CATEGORY[tool] ?? "other"];
       const friendly = friendlyToolName(tool);
       const preview = tool && event.message?.startsWith(tool) ? event.message.slice(tool.length).trim() : event.message ?? "";
-      return color(`\u2699 ${friendly} (${preview})...`);
+      return color(`\u2699  ${friendly} (${preview})...`);
     }
     case "tool_completed": {
       const tool = typeof event.data?.tool === "string" ? event.data.tool : "";
@@ -173,14 +269,32 @@ function formatEvent(event) {
       const output = typeof event.data?.output === "string" ? event.data.output.trim() : "";
       const firstLine = (output.split("\n")[0] ?? event.message ?? "").slice(0, 160);
       const color = success ? CATEGORY_COLOR[TOOL_CATEGORY[tool] ?? "other"] : chalk.red;
-      return color(`  ${success ? "\u2713" : "\u2717"} ${firstLine}`);
+      return color(`  ${success ? "\u2713" : "\u2717"}  ${firstLine}`);
     }
     case "approval":
-      return chalk.magenta(`\u{1F510} Asking permission to use ${event.message ?? "tool"}...`);
+      return chalk.magenta(`\u{1F510}  Asking permission to use ${event.message ?? "tool"}...`);
     case "warning":
-      return chalk.yellow(`\u26A0 ${event.message ?? ""}`);
+      return chalk.yellow(`\u26A0  ${event.message ?? ""}`);
     case "error":
-      return chalk.red(`\u2716 ${event.message ?? ""}`);
+      return chalk.red(`\u2716  ${event.message ?? ""}`);
+    case "patch": {
+      const filePath = typeof event.data?.path === "string" ? event.data.path : "file";
+      const oldStr = typeof event.data?.old_string === "string" ? event.data.old_string : "";
+      const newStr = typeof event.data?.new_string === "string" ? event.data.new_string : "";
+      const MAX = 60;
+      const oldLines = oldStr.split(/\r?\n/);
+      const newLines = newStr.split(/\r?\n/);
+      const out = [chalk.bold.magenta(`\u270E  ${filePath}`)];
+      for (const line of oldLines.slice(0, MAX)) {
+        out.push(chalk.bgRed.white(` - ${line}`));
+      }
+      if (oldLines.length > MAX) out.push(chalk.bgRed.white(`   \u2026 ${oldLines.length - MAX} more removed line(s)`));
+      for (const line of newLines.slice(0, MAX)) {
+        out.push(chalk.bgGreen.black(` + ${line}`));
+      }
+      if (newLines.length > MAX) out.push(chalk.bgGreen.black(`   \u2026 ${newLines.length - MAX} more added line(s)`));
+      return out.join("\n");
+    }
     case "task_completed": {
       const success = event.data?.success === true;
       const usage = event.data?.usage;
@@ -201,9 +315,13 @@ function formatEvent(event) {
       if (modifiedFiles.length > 0) stats.push(`files ${modifiedFiles.length}`);
       const sep = chalk.dim("\u2500".repeat(48));
       const statsLine = chalk.cyan(` ${stats.join(" \xB7 ")}`);
-      const statusLine = success ? chalk.green.bold("\u2714 Task completed") : chalk.red.bold("\u2716 Task failed");
-      const block = [statusLine, sep, statsLine, sep];
-      return block.join("\n");
+      const cancelled = event.data?.cancelled === true;
+      const statusLine = cancelled ? chalk.yellow.bold("\u2716 Task cancelled") : success ? chalk.green.bold("\u2714 Task completed") : chalk.red.bold("\u2716 Task failed");
+      const filesLine = modifiedFiles.length > 0 ? chalk.cyan.dim(`   \u{1F4DD} ${modifiedFiles.length} file(s): ${modifiedFiles.join(", ")}`) : "";
+      const tipLine = success ? chalk.dim("   Next: type a new task, or /help for commands") : chalk.yellow.dim("   The task did not finish \u2014 check the steps above and retry");
+      const detailsLine = toolCalls > 0 ? chalk.dim(`   \u{1F50D} press d to toggle ${toolCalls} tool call(s)`) : "";
+      const block = [sep, statusLine, statsLine, filesLine, tipLine, detailsLine, sep, ""];
+      return block.filter((line) => line !== "").join("\n");
     }
     default:
       return null;
@@ -366,6 +484,9 @@ function buildSystemPrompt(cwd) {
   const tree = projectTree(cwd).trim() || "(empty)";
   return `You are MenteE, an autonomous software-engineering agent working inside a repository on the user's machine.
 
+# Your design philosophy
+You are built around a tool harness: every meaningful action (reading, searching, editing, running, git) goes through a tool. Use the harness decisively and efficiently. Prefer precise tool calls over long prose so token usage stays very low while your engineering stays sharp and intelligent. A good session does more with fewer tokens \u2014 call exactly the tool needed, read only what you must, and let the harness do the heavy lifting.
+
 # Environment
 - Workspace: ${cwd}
 - Platform: ${os2.platform()} (${os2.release()}), shell commands run with the system shell
@@ -386,6 +507,8 @@ ${tree}
 # Tool usage notes
 - Call only the tools needed for the immediate next step. Do NOT read files you already understand, and do NOT read build/config files (e.g. *.config.ts, tsconfig.json) unless the task specifically needs them.
 - Prefer search_code over reading many files.
+- NEVER start long-running servers, dev servers, or watchers (e.g. 'npm run dev', 'npm start', 'vite', 'npm run watch', 'python -m http.server') yourself. These block and never exit. If the user needs to run the app, give them the exact command to run in their OWN terminal. Only run commands that exit on their own.
+- If a task result requires running the app to verify, say so and provide the command \u2014 do not run it for them.
 
 # Research strategy (IMPORTANT \u2014 HARD RULE)
 - The file tree above already shows the whole structure. Do NOT read files just to "see what's there".
@@ -538,11 +661,11 @@ function isRateLimitError(error) {
   }
   return /\b429\b|max rpm|rate limit|too many requests/i.test(error.message);
 }
-async function generateWithRetry(provider, model, system, messages, tools, bus) {
+async function generateWithRetry(provider, model, system, messages, tools, bus, onToken) {
   let lastError = null;
   for (let attempt = 0; attempt <= RATE_LIMIT_MAX_ATTEMPTS; attempt++) {
     try {
-      return await provider.generate({ system, messages, tools: tools.schemas() }, model);
+      return await provider.generate({ system, messages, tools: tools.schemas(), onToken }, model);
     } catch (error) {
       lastError = error;
       if (attempt >= RATE_LIMIT_MAX_ATTEMPTS || !isRateLimitError(lastError)) {
@@ -593,7 +716,8 @@ async function runAgent(options) {
     bus,
     approval,
     maxIterations = 40,
-    systemExtra
+    systemExtra,
+    signal
   } = options;
   const state = createAgentState(task, maxIterations);
   const prior = formatConversationContext(cwd);
@@ -618,13 +742,31 @@ ${systemExtra}` : "");
   let finalText = "";
   let sawFinish = false;
   while (state.iteration < maxIterations) {
+    if (signal?.aborted) {
+      finalText = "Task cancelled.";
+      break;
+    }
     state.iteration += 1;
     state.usage.modelRequests += 1;
     bus.emit("model_request", `iteration ${state.iteration}/${maxIterations}`);
+    let thinkBuf = "";
+    let thinkTimer = null;
+    const flushThink = () => {
+      if (thinkBuf) {
+        bus.emit("thinking", thinkBuf);
+        thinkBuf = "";
+      }
+      thinkTimer = null;
+    };
+    const onToken = (delta) => {
+      thinkBuf += delta;
+      if (thinkTimer == null) thinkTimer = setTimeout(flushThink, 80);
+    };
     let response;
     try {
-      response = await generateWithRetry(provider, model, system, messages, tools, bus);
+      response = await generateWithRetry(provider, model, system, messages, tools, bus, onToken);
     } catch (error) {
+      flushThink();
       const message = error.message;
       let hint = "";
       if (/insufficient balance|no resource package|recharge/i.test(message)) {
@@ -646,6 +788,7 @@ ${systemExtra}` : "");
       });
       return { success: false, finalText, state };
     }
+    flushThink();
     bus.emit(
       "model_response",
       void 0,
@@ -674,7 +817,7 @@ ${systemExtra}` : "");
       content: response.content,
       tool_calls: response.toolCalls
     });
-    if (response.content && response.content.trim()) {
+    if (!onToken && response.content && response.content.trim()) {
       bus.emit("info", response.content.trim().slice(0, 300));
     }
     for (const call of response.toolCalls) {
@@ -768,12 +911,23 @@ ${systemExtra}` : "");
         success: result.success,
         output: result.output.slice(0, 2e3)
       });
+      if (tool.name === "apply_patch" && result.success && result.data?.kind === "patch") {
+        bus.emit("patch", void 0, {
+          path: result.data.path,
+          old_string: result.data.old_string,
+          new_string: result.data.new_string
+        });
+      }
       messages.push({
         role: "tool",
         tool_call_id: call.id,
         content: result.output
       });
     }
+    if (signal?.aborted) {
+      finalText = "Task cancelled.";
+      break;
+    }
     if (estimateContextChars(messages, system) > MAX_CONTEXT_CHARS) {
       bus.emit("warning", "Context is large; trimming oldest tool outputs.");
       trimOldToolResults(messages);
@@ -784,7 +938,7 @@ ${systemExtra}` : "");
     bus.emit("warning", finalText);
   }
   const success = sawFinish && state.errors.length === 0;
-  if (finalText) appendTurn(cwd, task, finalText);
+  if (finalText && !signal?.aborted) appendTurn(cwd, task, finalText);
   bus.emit("task_completed", finalText.slice(0, 400), {
     success,
     finalText,
@@ -792,7 +946,8 @@ ${systemExtra}` : "");
     toolCalls: state.totalToolCalls,
     modifiedFiles: state.modifiedFiles,
     usage: state.usage,
-    durationMs: Date.now() - state.startedAt
+    durationMs: Date.now() - state.startedAt,
+    cancelled: signal?.aborted === true
   });
   return { success, finalText, state };
 }
@@ -977,7 +1132,7 @@ var init_KeyDialog = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.5";
+    version = "0.1.9";
   }
 });
 
@@ -987,11 +1142,12 @@ __export(App_exports, {
   App: () => App
 });
 import { useEffect as useEffect2, useMemo as useMemo2, useRef, useState as useState3 } from "react";
-import { Box as Box4, Static, Text as Text4, useApp, useInput as useInput4 } from "ink";
+import { Box as Box4, Static, Text as Text4, useApp, useInput as useInput4, useStdout } from "ink";
 import TextInput2 from "ink-text-input";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 function App(props) {
   const { exit } = useApp();
+  const { stdout } = useStdout();
   const bus = useMemo2(() => new EventBus(), []);
   const bridge = useMemo2(() => new ApprovalBridge(), []);
   const [log, setLog] = useState3([]);
@@ -1014,23 +1170,31 @@ function App(props) {
   const [toolHistory, setToolHistory] = useState3([]);
   const [inspectorIndex, setInspectorIndex] = useState3(null);
   const [detailsOpen, setDetailsOpen] = useState3(false);
-  const [showTools, setShowTools] = useState3(true);
+  const [showDetails, setShowDetails] = useState3(false);
+  const [thinkingText, setThinkingText] = useState3("");
   const pendingTool = useRef(null);
   const counter = useRef(0);
   const stateRef = useRef({ running, approval, dialog, factoryResult, providerName, model });
   stateRef.current = { running, approval, dialog, factoryResult, providerName, model };
-  const appendLog = (text) => {
+  const abortRef = useRef(null);
+  const appendLog = (text, noise = false) => {
     if (!text) return;
     counter.current += 1;
-    const line = { id: counter.current, text };
+    const line = { id: counter.current, text, noise };
     setLog((prev) => [...prev, line]);
   };
   useEffect2(() => {
-    const HIDDEN_NOISY = /* @__PURE__ */ new Set(["tool_started", "tool_completed", "model_request", "info"]);
+    const TOOL_NOISE = /* @__PURE__ */ new Set(["tool_started", "tool_completed", "model_request"]);
     const unsubscribeLog = bus.subscribe((event) => {
-      if (!(showTools === false && HIDDEN_NOISY.has(event.type))) {
-        appendLog(formatEvent(event));
+      if (event.type === "thinking") {
+        const delta = (event.message ?? "").replace(/[\r\n]+/g, " ");
+        if (delta) setThinkingText((prev) => (prev + delta).slice(-4e3));
+        return;
       }
+      if (event.type === "model_request" || event.type === "task_completed") {
+        setThinkingText("");
+      }
+      appendLog(formatEvent(event), TOOL_NOISE.has(event.type));
       if (event.type === "tool_started") {
         const name = typeof event.data?.tool === "string" ? event.data.tool : "";
         const target = typeof event.message === "string" ? event.message : "";
@@ -1063,12 +1227,18 @@ function App(props) {
       unsubscribeLog();
       unsubscribeLog2();
     };
-  }, [bus, bridge, showTools]);
+  }, [bus, bridge, showDetails]);
   useEffect2(() => {
     if (!running) return;
     const timer = setInterval(() => setFrame((f) => (f + 1) % SPINNER_FRAMES.length), 80);
     return () => clearInterval(timer);
   }, [running]);
+  useEffect2(() => {
+    const turns = loadConversation(props.cwd);
+    if (turns.length > 0) {
+      appendLog(`Resumed previous session \u2014 ${turns.length} prior turn(s) loaded as context.`);
+    }
+  }, []);
   useEffect2(() => {
     if (!typing || finalPending == null) return;
     if (typedText.length >= finalPending.length) {
@@ -1076,8 +1246,11 @@ function App(props) {
       return;
     }
     const timer = setTimeout(() => {
-      setTypedText(finalPending.slice(0, typedText.length + 3));
-    }, 16);
+      const rest = finalPending.slice(typedText.length);
+      const match = /^(\S+\s*)/.exec(rest);
+      const step = match ? match[0].length : 1;
+      setTypedText(finalPending.slice(0, typedText.length + step));
+    }, 55);
     return () => clearTimeout(timer);
   }, [typing, finalPending, typedText]);
   const updateConfig = (mutate) => {
@@ -1222,7 +1395,10 @@ function App(props) {
     setToolHistory([]);
     setInspectorIndex(null);
     setDetailsOpen(false);
+    setShowDetails(false);
     setRunning(true);
+    const ac = new AbortController();
+    abortRef.current = ac;
     try {
       await runAgent({
         task,
@@ -1233,7 +1409,8 @@ function App(props) {
         bus,
         approval: props.yes ? async () => "allow" : bridge.handler,
         maxIterations: props.maxIterations,
-        systemExtra: props.systemExtra
+        systemExtra: props.systemExtra,
+        signal: ac.signal
       });
     } catch (error) {
       bus.emit("error", error.message);
@@ -1270,16 +1447,25 @@ function App(props) {
     }
   };
   useInput4((input, key) => {
+    if (key.ctrl && input === "c") {
+      if (stateRef.current.running) {
+        appendLog("\u23F9 Interrupted by you \u2014 stopping the current task and returning to the prompt.");
+        killActiveChild();
+        abortRef.current?.abort();
+        return;
+      }
+      exit();
+      setTimeout(() => process.exit(0), 50);
+      return;
+    }
+    if (key.meta && (input === "d" || input === "D")) {
+      setShowDetails((v) => !v);
+      return;
+    }
     if (stateRef.current.dialog || stateRef.current.approval || stateRef.current.running) return;
     if (key.meta && (input === "m" || input === "M")) openModelDialog();
     else if (key.ctrl && input === "p") setDialog({ kind: "provider" });
     else if (key.ctrl && input === "k") setDialog({ kind: "key" });
-    else if (input === "d" || input === "D") cycleInspector();
-    else if (input === "t" || input === "T") setShowTools((v) => !v);
-    else if (key.ctrl && input === "c") {
-      exit();
-      setTimeout(() => process.exit(0), 50);
-    }
   });
   const modelLabel = model ?? factoryResult.provider?.defaultModel ?? (factoryResult.error ? "no key" : "");
   const header = /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginBottom: 1, children: [
@@ -1290,114 +1476,117 @@ function App(props) {
       " \xB7 ",
       providerName,
       modelLabel ? `:${modelLabel}` : "",
-      " \xB7 tools ",
-      showTools ? "on" : "off",
+      " \xB7 details ",
+      showDetails ? "open" : "collapsed",
       " \xB7 ",
       props.cwd
     ] }),
-    /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "Alt+M model \xB7 Ctrl+P provider \xB7 Ctrl+K key \xB7 t hide tools \xB7 d details \xB7 /help" })
+    /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "Alt+M model \xB7 Ctrl+P provider \xB7 Ctrl+K key \xB7 Alt+D details \xB7 /help" })
   ] }, "header");
+  const cols = stdout.columns || 80;
+  const marquee = thinkingText.slice(-Math.max(1, cols - 4));
   return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx4(
-      Static,
-      {
-        items: [
-          { key: "header", text: header },
-          ...log.map((line) => ({ key: `l${line.id}`, text: /* @__PURE__ */ jsx4(Text4, { children: line.text }) }))
-        ],
-        children: (item) => /* @__PURE__ */ jsx4(Box4, { children: item.text }, item.key)
-      }
-    ),
-    finalPending !== null ? /* @__PURE__ */ jsxs4(Box4, { marginTop: 1, children: [
-      /* @__PURE__ */ jsx4(Text4, { color: "green", children: typedText }),
-      typing ? /* @__PURE__ */ jsx4(Text4, { color: "green", children: "\u258C" }) : null
-    ] }) : null,
-    detailsOpen && inspectorIndex !== null && toolHistory[inspectorIndex] ? (() => {
-      const rec = toolHistory[inspectorIndex];
-      const outLines = rec.output.split("\n").slice(0, 24).join("\n");
-      return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "gray", paddingX: 1, children: [
-        /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
-          " tool details (",
-          inspectorIndex + 1,
-          "/",
-          toolHistory.length,
-          ") \xB7 press d to cycle "
-        ] }),
-        /* @__PURE__ */ jsxs4(Text4, { color: toolColorName(rec.name), bold: true, children: [
-          rec.name,
-          " ",
-          rec.target
-        ] }),
-        /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
-          "args: ",
-          rec.args.slice(0, 400) || "(none)"
-        ] }),
-        /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: outLines || "(no output)" })
-      ] });
-    })() : null,
-    dialog?.kind === "model" ? /* @__PURE__ */ jsx4(
-      SelectDialog,
-      {
-        title: `Model \u2014 ${providerName}`,
-        items: modelItems,
-        loading: modelLoading,
-        error: modelError,
-        current: model ?? factoryResult.provider?.defaultModel,
-        onSelect: (id) => {
-          setDialog(null);
-          setModelAndPersist(id);
-        },
-        onClose: () => setDialog(null)
-      }
-    ) : dialog?.kind === "provider" ? /* @__PURE__ */ jsx4(
-      SelectDialog,
-      {
-        title: "Provider",
-        items: PROVIDER_NAMES,
-        descriptions: PROVIDER_DESCRIPTIONS,
-        current: providerName,
-        onSelect: (name) => {
-          setDialog(null);
-          switchProvider(name);
-        },
-        onClose: () => setDialog(null)
-      }
-    ) : dialog?.kind === "key" ? /* @__PURE__ */ jsx4(
-      KeyDialog,
-      {
-        providerName,
-        onSubmit: (value) => {
-          setDialog(null);
-          saveKey(value);
-        },
-        onClose: () => setDialog(null)
-      }
-    ) : approval ? /* @__PURE__ */ jsx4(
-      ApprovalPrompt,
-      {
-        request: approval,
-        onDecision: (decision) => {
-          bridge.resolve(decision);
-          if (decision === "always") bus.emit("info", "Approved for the rest of this session.");
+    /* @__PURE__ */ jsx4(Static, { items: [{ key: "header", text: header }], children: (item) => /* @__PURE__ */ jsx4(Box4, { children: item.text }, item.key) }),
+    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
+      log.filter((l) => showDetails || !l.noise).map((line) => /* @__PURE__ */ jsx4(Text4, { children: line.text }, line.id)),
+      finalPending !== null ? /* @__PURE__ */ jsxs4(Box4, { marginTop: 1, children: [
+        /* @__PURE__ */ jsx4(Text4, { color: "green", children: typedText }),
+        typing ? /* @__PURE__ */ jsx4(Text4, { color: "green", children: "\u258C" }) : null
+      ] }) : null,
+      detailsOpen && inspectorIndex !== null && toolHistory[inspectorIndex] ? (() => {
+        const rec = toolHistory[inspectorIndex];
+        const outLines = rec.output.split("\n").slice(0, 24).join("\n");
+        return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: "gray", paddingX: 1, children: [
+          /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
+            " tool details (",
+            inspectorIndex + 1,
+            "/",
+            toolHistory.length,
+            ") \xB7 press d to cycle "
+          ] }),
+          /* @__PURE__ */ jsxs4(Text4, { color: toolColorName(rec.name), bold: true, children: [
+            rec.name,
+            " ",
+            rec.target
+          ] }),
+          /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
+            "args: ",
+            rec.args.slice(0, 400) || "(none)"
+          ] }),
+          /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: outLines || "(no output)" })
+        ] });
+      })() : null,
+      dialog?.kind === "model" ? /* @__PURE__ */ jsx4(
+        SelectDialog,
+        {
+          title: `Model \u2014 ${providerName}`,
+          items: modelItems,
+          loading: modelLoading,
+          error: modelError,
+          current: model ?? factoryResult.provider?.defaultModel,
+          onSelect: (id) => {
+            setDialog(null);
+            setModelAndPersist(id);
+          },
+          onClose: () => setDialog(null)
         }
-      }
-    ) : running ? /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsxs4(Text4, { color: "yellow", children: [
-        SPINNER_FRAMES[frame],
-        " "
-      ] }),
-      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "agent working... (Ctrl+C to exit)" })
-    ] }) : /* @__PURE__ */ jsxs4(Box4, { children: [
-      /* @__PURE__ */ jsx4(Text4, { color: "cyan", bold: true, children: "\u25B8 " }),
-      /* @__PURE__ */ jsx4(
-        TextInput2,
+      ) : dialog?.kind === "provider" ? /* @__PURE__ */ jsx4(
+        SelectDialog,
         {
-          value: taskInput,
-          onChange: setTaskInput,
-          onSubmit: handleSubmit,
-          placeholder: "Describe a task, or /help"
+          title: "Provider",
+          items: PROVIDER_NAMES,
+          descriptions: PROVIDER_DESCRIPTIONS,
+          current: providerName,
+          onSelect: (name) => {
+            setDialog(null);
+            switchProvider(name);
+          },
+          onClose: () => setDialog(null)
         }
-      )
+      ) : dialog?.kind === "key" ? /* @__PURE__ */ jsx4(
+        KeyDialog,
+        {
+          providerName,
+          onSubmit: (value) => {
+            setDialog(null);
+            saveKey(value);
+          },
+          onClose: () => setDialog(null)
+        }
+      ) : approval ? /* @__PURE__ */ jsx4(
+        ApprovalPrompt,
+        {
+          request: approval,
+          onDecision: (decision) => {
+            bridge.resolve(decision);
+            if (decision === "always") bus.emit("info", "Approved for the rest of this session.");
+          }
+        }
+      ) : running ? /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsxs4(Box4, { children: [
+          /* @__PURE__ */ jsxs4(Text4, { color: "yellow", children: [
+            SPINNER_FRAMES[frame],
+            " "
+          ] }),
+          /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "agent working... (Ctrl+C to exit)" })
+        ] }),
+        thinkingText ? /* @__PURE__ */ jsxs4(Box4, { children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "\u{1F4AD} " }),
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", dimColor: true, children: marquee }),
+          /* @__PURE__ */ jsx4(Text4, { color: "cyan", children: "\u258C" })
+        ] }) : null
+      ] }) : /* @__PURE__ */ jsxs4(Box4, { children: [
+        /* @__PURE__ */ jsx4(Text4, { color: "cyan", bold: true, children: "\u25B8 " }),
+        /* @__PURE__ */ jsx4(
+          TextInput2,
+          {
+            value: taskInput,
+            onChange: setTaskInput,
+            onSubmit: handleSubmit,
+            placeholder: "Describe a task, or /help"
+          }
+        )
+      ] })
     ] })
   ] });
 }
@@ -1410,6 +1599,8 @@ var init_App = __esm({
     init_render();
     init_approval();
     init_loop();
+    init_conversation();
+    init_exec();
     init_config();
     init_Approval();
     init_SelectDialog();
@@ -1466,6 +1657,20 @@ function toWireTools(tools) {
     }
   }));
 }
+function parseResponse(response) {
+  const choice = response.choices?.[0];
+  const message = choice?.message;
+  const usage = response.usage ? {
+    inputTokens: response.usage.prompt_tokens ?? 0,
+    outputTokens: response.usage.completion_tokens ?? 0
+  } : void 0;
+  return {
+    content: message?.content ?? null,
+    toolCalls: message?.tool_calls ?? [],
+    finishReason: mapFinishReason(choice?.finish_reason),
+    usage
+  };
+}
 var OpenAICompatProvider = class {
   name;
   defaultModel;
@@ -1483,26 +1688,71 @@ var OpenAICompatProvider = class {
       { role: "system", content: request.system },
       ...request.messages
     ];
-    const response = await this.client.chat.completions.create({
+    const baseParams = {
       model: model ?? this.defaultModel,
       // the wire format matches our internal shape; keep loose typing at the boundary
       messages,
       ...request.tools.length > 0 ? { tools: toWireTools(request.tools) } : {},
       ...request.temperature !== void 0 ? { temperature: request.temperature } : {},
       ...request.maxTokens ? { max_tokens: request.maxTokens } : {}
-    });
-    const choice = response.choices[0];
-    const message = choice?.message;
-    const usage = response.usage ? {
-      inputTokens: response.usage.prompt_tokens ?? 0,
-      outputTokens: response.usage.completion_tokens ?? 0
-    } : void 0;
-    return {
-      content: message?.content ?? null,
-      toolCalls: message?.tool_calls ?? [],
-      finishReason: mapFinishReason(choice?.finish_reason),
-      usage
     };
+    if (!request.onToken) {
+      const response = await this.client.chat.completions.create(baseParams);
+      return parseResponse(response);
+    }
+    try {
+      const stream = await this.client.chat.completions.create({
+        ...baseParams,
+        stream: true,
+        stream_options: { include_usage: true }
+      });
+      let content = "";
+      let finishReason = "stop";
+      let usage;
+      const tcMap = /* @__PURE__ */ new Map();
+      for await (const chunk of stream) {
+        const choice = chunk.choices?.[0];
+        const delta = choice?.delta;
+        if (delta?.content) {
+          content += delta.content;
+          request.onToken(delta.content);
+        }
+        if (delta?.tool_calls) {
+          for (const tc of delta.tool_calls) {
+            const idx = tc.index ?? 0;
+            let acc = tcMap.get(idx);
+            if (!acc) {
+              acc = { args: "" };
+              tcMap.set(idx, acc);
+            }
+            if (tc.id) acc.id = tc.id;
+            if (tc.function?.name) acc.name = tc.function.name;
+            if (tc.function?.arguments) acc.args += tc.function.arguments;
+          }
+        }
+        if (choice?.finish_reason) finishReason = choice.finish_reason;
+        if (chunk.usage) {
+          usage = {
+            inputTokens: chunk.usage.prompt_tokens ?? 0,
+            outputTokens: chunk.usage.completion_tokens ?? 0
+          };
+        }
+      }
+      const toolCalls = [...tcMap.entries()].sort((a, b) => a[0] - b[0]).map(([idx, acc]) => ({
+        id: acc.id ?? `call_${idx}`,
+        type: "function",
+        function: { name: acc.name ?? "", arguments: acc.args }
+      }));
+      return {
+        content,
+        toolCalls,
+        finishReason: mapFinishReason(finishReason),
+        usage
+      };
+    } catch {
+      const response = await this.client.chat.completions.create(baseParams);
+      return parseResponse(response);
+    }
   }
   async listModels() {
     const page = await this.client.models.list();
@@ -2374,85 +2624,8 @@ function classifyCommand(command) {
   return overall;
 }
 
-// src/tools/exec.ts
-import { spawn } from "child_process";
-function killTree(child) {
-  if (child.pid === void 0) return;
-  if (process.platform === "win32") {
-    spawn(`taskkill /pid ${String(child.pid)} /T /F`, { stdio: "ignore", shell: true });
-  } else {
-    child.kill("SIGKILL");
-  }
-}
-async function runShellCommand(command, cwd, timeoutMs = 12e4, maxChars = 1e5) {
-  return new Promise((resolve) => {
-    const started = Date.now();
-    const child = spawn(command, {
-      shell: true,
-      cwd,
-      env: { ...process.env, MENTEE: "1" },
-      windowsHide: true
-    });
-    let stdout = "";
-    let stderr = "";
-    let killed = false;
-    const timer = setTimeout(() => {
-      killed = true;
-      killTree(child);
-    }, timeoutMs);
-    child.stdout?.on("data", (chunk) => {
-      if (stdout.length < maxChars * 2) stdout += chunk.toString("utf8");
-    });
-    child.stderr?.on("data", (chunk) => {
-      if (stderr.length < maxChars * 2) stderr += chunk.toString("utf8");
-    });
-    child.on("error", (error) => {
-      clearTimeout(timer);
-      resolve({
-        exitCode: -1,
-        stdout,
-        stderr: `${stderr}
-${error.message}`.trim(),
-        durationMs: Date.now() - started
-      });
-    });
-    child.on("close", (code) => {
-      clearTimeout(timer);
-      resolve({
-        exitCode: killed ? "timeout" : code ?? -1,
-        stdout,
-        stderr,
-        durationMs: Date.now() - started
-      });
-    });
-  });
-}
-function formatOutcome(outcome, maxChars = 1e5) {
-  const cut = (text, limit) => {
-    if (text.length <= limit) return { text, truncated: false };
-    const head = Math.floor(limit * 0.7);
-    return {
-      text: `${text.slice(0, head)}
-...[truncated, ${text.length - head} chars removed]...`,
-      truncated: true
-    };
-  };
-  const out = cut(outcome.stdout.trim(), maxChars);
-  const err = cut(outcome.stderr.trim(), Math.floor(maxChars / 2));
-  const sections = [`exit_code: ${outcome.exitCode}`, `duration_ms: ${outcome.durationMs}`];
-  if (out.text) sections.push(`stdout:
-${out.text}`);
-  if (err.text) sections.push(`stderr:
-${err.text}`);
-  if (!out.text && !err.text) sections.push("(no output)");
-  return {
-    output: sections.join("\n"),
-    success: outcome.exitCode === 0,
-    truncated: out.truncated || err.truncated
-  };
-}
-
 // src/tools/terminal.ts
+init_exec();
 var DEFAULT_TIMEOUT_MS = 12e4;
 var MAX_OUTPUT_CHARS = 1e5;
 var executeCommand = {
@@ -2488,6 +2661,7 @@ var executeCommand = {
 
 // src/tools/testing.ts
 init_base();
+init_exec();
 import fs4 from "fs";
 import path4 from "path";
 var DEFAULT_TIMEOUT_MS2 = 18e4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@menteeai/menteeswe",
-  "version": "0.1.5",
+  "version": "0.1.9",
   "description": "MenteE SWE — a model-agnostic autonomous software-engineering agent CLI. Bring your own intelligence: Kimi, GLM/Z.ai, and more.",
   "type": "module",
   "license": "MIT",