@dugleelabs/copair 1.2.0 → 1.3.0

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/index.ts
 import { join as join15 } from "path";
+import { existsSync as existsSync18, readFileSync as readFileSync10 } from "fs";
 
 // src/cli/args.ts
 import { Command } from "commander";
@@ -4757,14 +4758,65 @@ var AgentBridge = class extends EventEmitter {
 };
 
 // src/cli/ui/app.tsx
-import { useState as useState4, useEffect as useEffect3, useCallback as useCallback3, useImperativeHandle, forwardRef, useRef as useRef2 } from "react";
-import { render, Box as Box6, Text as Text6, Static, useApp, useInput as useInput3 } from "ink";
+import { useState as useState6, useEffect as useEffect4, useCallback as useCallback3, useImperativeHandle, forwardRef, useRef as useRef2 } from "react";
+import { render, Box as Box8, Text as Text10, Static, useApp, useInput as useInput4 } from "ink";
 
 // src/cli/ui/bordered-input.tsx
 import { useState, useEffect, useCallback, useRef } from "react";
-import { Box, Text, useStdout, useInput } from "ink";
-import TextInput from "ink-text-input";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Box, Text as Text2, useStdout, useInput } from "ink";
+
+// src/cli/ui/cursor-text.tsx
+import { Text } from "ink";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+function CursorText({ value, cursorPos, active }) {
+  if (!active) return /* @__PURE__ */ jsx(Text, { children: value });
+  const chars = [...value];
+  const before = chars.slice(0, cursorPos).join("");
+  const at = chars[cursorPos] ?? " ";
+  const after = chars.slice(cursorPos + 1).join("");
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Text, { children: before }),
+    /* @__PURE__ */ jsx(Text, { inverse: true, children: at }),
+    /* @__PURE__ */ jsx(Text, { children: after })
+  ] });
+}
+
+// src/cli/ui/cursor-utils.ts
+function detectWordNav(input) {
+  if (input === "\x1B[1;3D" || input === "\x1Bb" || input === "\x1B[1;5D") return "word-left";
+  if (input === "\x1B[1;3C" || input === "\x1Bf" || input === "\x1B[1;5C") return "word-right";
+  return null;
+}
+function detectWordDeletion(input, key) {
+  const isAltBackspace = key.meta && key.backspace || input === "\x1B\x7F";
+  const isCtrlW = key.ctrl && input === "w";
+  return isAltBackspace || isCtrlW;
+}
+function isPasteInput(input, key) {
+  if (key.ctrl || key.meta) return false;
+  if (input.startsWith("[200~")) return true;
+  return input.length > 1 && /[\n\r]/.test(input);
+}
+function cleanPastedInput(input) {
+  return input.replace(/^\[200~/, "").replace(new RegExp(String.fromCharCode(27) + "\\[201~$"), "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
+function wordBoundaryLeft(value, pos) {
+  const chars = [...value];
+  let i = pos;
+  while (i > 0 && chars[i - 1] === " ") i--;
+  while (i > 0 && chars[i - 1] !== " ") i--;
+  return i;
+}
+function wordBoundaryRight(value, pos) {
+  const chars = [...value];
+  let i = pos;
+  while (i < chars.length && chars[i] === " ") i++;
+  while (i < chars.length && chars[i] !== " ") i++;
+  return i;
+}
+
+// src/cli/ui/bordered-input.tsx
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 function supportsUnicode() {
   const term = process.env.TERM ?? "";
   const lang = process.env.LANG ?? "";
@@ -4785,16 +4837,18 @@ function BorderedInput({
   completionEngine,
   onSubmit,
   onHistoryAppend,
-  onSlashCommand
+  onSlashCommand,
+  activeSuggestion,
+  injectedValue
 }) {
   const [value, setValue] = useState("");
+  const [cursorPos, setCursorPos] = useState(0);
   const [multiLineBuffer, setMultiLineBuffer] = useState(null);
-  const [expanded, setExpanded] = useState(false);
+  const [completionHint, setCompletionHint] = useState(null);
   const { stdout } = useStdout();
   const [columns, setColumns] = useState(stdout?.columns ?? 80);
   const historyIdx = useRef(-1);
   const savedInput = useRef("");
-  const [completionHint, setCompletionHint] = useState(null);
   useEffect(() => {
     if (!stdout) return;
     const onResize = () => setColumns(stdout.columns);
@@ -4803,15 +4857,79 @@ function BorderedInput({
       stdout.off("resize", onResize);
     };
   }, [stdout]);
-  useInput((_input, key) => {
+  useEffect(() => {
+    if (injectedValue != null) {
+      setValue(injectedValue.value);
+      setCursorPos([...injectedValue.value].length);
+    }
+  }, [injectedValue]);
+  const processSubmit = useCallback((input) => {
+    const trimmed = input.trim();
+    if (!trimmed) return;
+    historyIdx.current = -1;
+    savedInput.current = "";
+    setCompletionHint(null);
+    if (trimmed === "/expand") {
+      setValue("");
+      setCursorPos(0);
+      return;
+    }
+    if (trimmed === "/send" && multiLineBuffer) {
+      onHistoryAppend?.(multiLineBuffer);
+      onSubmit(multiLineBuffer);
+      setMultiLineBuffer(null);
+      setValue("");
+      setCursorPos(0);
+      return;
+    }
+    if (trimmed.startsWith("/") && onSlashCommand) {
+      const spaceIdx = trimmed.indexOf(" ");
+      const cmd = spaceIdx === -1 ? trimmed.slice(1) : trimmed.slice(1, spaceIdx);
+      const args = spaceIdx === -1 ? void 0 : trimmed.slice(spaceIdx + 1);
+      onHistoryAppend?.(trimmed);
+      onSlashCommand(cmd, args);
+      setValue("");
+      setCursorPos(0);
+      return;
+    }
+    onHistoryAppend?.(input);
+    onSubmit(input);
+    setValue("");
+    setCursorPos(0);
+  }, [multiLineBuffer, onSubmit, onSlashCommand, onHistoryAppend]);
+  useInput((input, key) => {
     if (!isActive) return;
-    if (key.upArrow && history.length > 0) {
-      if (historyIdx.current === -1) {
-        savedInput.current = value;
+    if (multiLineBuffer !== null) {
+      if (key.return) {
+        onHistoryAppend?.(multiLineBuffer);
+        onSubmit(multiLineBuffer);
+        setMultiLineBuffer(null);
+        setValue("");
+        setCursorPos(0);
+        historyIdx.current = -1;
+        savedInput.current = "";
+        return;
+      }
+      if (key.escape) {
+        setMultiLineBuffer(null);
+        setValue("");
+        setCursorPos(0);
+        return;
       }
+    }
+    if (isPasteInput(input, key)) {
+      setMultiLineBuffer(cleanPastedInput(input));
+      setValue("");
+      setCursorPos(0);
+      return;
+    }
+    if (key.upArrow && history.length > 0) {
+      if (historyIdx.current === -1) savedInput.current = value;
       const newIdx = Math.min(historyIdx.current + 1, history.length - 1);
       historyIdx.current = newIdx;
-      setValue(history[history.length - 1 - newIdx]);
+      const newVal = history[history.length - 1 - newIdx];
+      setValue(newVal);
+      setCursorPos([...newVal].length);
       setCompletionHint(null);
       return;
     }
@@ -4819,110 +4937,175 @@ function BorderedInput({
       if (historyIdx.current <= 0) {
         historyIdx.current = -1;
         setValue(savedInput.current);
+        setCursorPos([...savedInput.current].length);
       } else {
         historyIdx.current--;
-        setValue(history[history.length - 1 - historyIdx.current]);
+        const newVal = history[history.length - 1 - historyIdx.current];
+        setValue(newVal);
+        setCursorPos([...newVal].length);
       }
       setCompletionHint(null);
       return;
     }
-    if (key.tab && completionEngine && value) {
-      const items = completionEngine.complete(value);
-      if (items.length === 1) {
-        setValue(items[0].value);
-        setCompletionHint(null);
-      } else if (items.length > 1) {
-        const common = completionEngine.commonPrefix(items);
-        if (common.length > value.length) {
-          setValue(common);
-        }
-        setCompletionHint(items.map((i) => i.label).join("  "));
+    if (key.return) {
+      processSubmit(value);
+      return;
+    }
+    const isHome = input === "\x1B[H" || input === "\x1B[1~";
+    const isEnd = input === "\x1B[F" || input === "\x1B[4~";
+    if (key.ctrl && input === "a" || isHome) {
+      setCursorPos(0);
+      return;
+    }
+    if (key.ctrl && input === "e" || isEnd) {
+      setCursorPos([...value].length);
+      return;
+    }
+    if (key.ctrl && input === "u") {
+      const chars2 = [...value];
+      setValue(chars2.slice(cursorPos).join(""));
+      setCursorPos(0);
+      historyIdx.current = -1;
+      return;
+    }
+    if (key.ctrl && input === "k") {
+      const chars2 = [...value];
+      setValue(chars2.slice(0, cursorPos).join(""));
+      historyIdx.current = -1;
+      return;
+    }
+    const wordNav = detectWordNav(input);
+    if (wordNav === "word-left") {
+      setCursorPos(wordBoundaryLeft(value, cursorPos));
+      return;
+    }
+    if (wordNav === "word-right") {
+      setCursorPos(wordBoundaryRight(value, cursorPos));
+      return;
+    }
+    if (detectWordDeletion(input, key)) {
+      const chars2 = [...value];
+      const newPos = wordBoundaryLeft(value, cursorPos);
+      setValue([...chars2.slice(0, newPos), ...chars2.slice(cursorPos)].join(""));
+      setCursorPos(newPos);
+      historyIdx.current = -1;
+      return;
+    }
+    if (key.backspace) {
+      if (cursorPos > 0) {
+        const chars2 = [...value];
+        chars2.splice(cursorPos - 1, 1);
+        setValue(chars2.join(""));
+        setCursorPos(cursorPos - 1);
+        historyIdx.current = -1;
       }
       return;
     }
-  }, { isActive });
-  const handleChange = useCallback((newValue) => {
-    historyIdx.current = -1;
-    setCompletionHint(null);
-    if (newValue.includes("\n")) {
-      setMultiLineBuffer(newValue);
-      setExpanded(false);
-      const firstLine = newValue.split("\n")[0];
-      setValue(firstLine);
-    } else {
-      if (multiLineBuffer !== null && !newValue.startsWith(value)) {
-        setMultiLineBuffer(null);
+    if (key.delete) {
+      if (cursorPos > 0) {
+        const chars2 = [...value];
+        chars2.splice(cursorPos - 1, 1);
+        setValue(chars2.join(""));
+        setCursorPos(cursorPos - 1);
+        historyIdx.current = -1;
       }
-      setValue(newValue);
+      return;
     }
-  }, [multiLineBuffer, value]);
-  const handleSubmit = useCallback((input) => {
-    const trimmed = input.trim();
-    if (!trimmed) return;
-    historyIdx.current = -1;
-    savedInput.current = "";
-    setCompletionHint(null);
-    if (trimmed === "/expand" && multiLineBuffer) {
-      setExpanded(!expanded);
-      setValue("");
+    if (key.leftArrow) {
+      setCursorPos(Math.max(0, cursorPos - 1));
       return;
     }
-    if (trimmed === "/send" && multiLineBuffer) {
-      onHistoryAppend?.(multiLineBuffer);
-      onSubmit(multiLineBuffer);
-      setMultiLineBuffer(null);
-      setExpanded(false);
-      setValue("");
+    if (key.rightArrow) {
+      setCursorPos(Math.min([...value].length, cursorPos + 1));
       return;
     }
-    if (trimmed.startsWith("/") && onSlashCommand) {
-      const spaceIdx = trimmed.indexOf(" ");
-      const cmd = spaceIdx === -1 ? trimmed.slice(1) : trimmed.slice(1, spaceIdx);
-      const args = spaceIdx === -1 ? void 0 : trimmed.slice(spaceIdx + 1);
-      onHistoryAppend?.(trimmed);
-      onSlashCommand(cmd, args);
-      setValue("");
+    if (key.tab) {
+      if (!value && activeSuggestion) {
+        onHistoryAppend?.(activeSuggestion.action);
+        onSubmit(activeSuggestion.action);
+        historyIdx.current = -1;
+        savedInput.current = "";
+        return;
+      }
+      if (completionEngine && value) {
+        const items = completionEngine.complete(value);
+        if (items.length === 1) {
+          setValue(items[0].value);
+          setCursorPos([...items[0].value].length);
+          setCompletionHint(null);
+        } else if (items.length > 1) {
+          const common = completionEngine.commonPrefix(items);
+          if (common.length > value.length) {
+            setValue(common);
+            setCursorPos([...common].length);
+          }
+          setCompletionHint(items.map((i) => i.label).join("  "));
+        }
+      }
       return;
     }
-    const toSubmit = multiLineBuffer ?? input;
-    onHistoryAppend?.(toSubmit);
-    onSubmit(toSubmit);
-    setMultiLineBuffer(null);
-    setExpanded(false);
-    setValue("");
-  }, [multiLineBuffer, expanded, onSubmit, onSlashCommand, onHistoryAppend]);
-  const lineCount = multiLineBuffer ? multiLineBuffer.split("\n").length : 0;
+    if (key.ctrl && input === "r") {
+      onSlashCommand?.("history-search");
+      return;
+    }
+    const cp = input.codePointAt(0);
+    if (cp === void 0 || cp < 32 || cp === 127) return;
+    if (key.ctrl || key.meta) return;
+    const chars = [...value];
+    const inputChars = [...input];
+    chars.splice(cursorPos, 0, ...inputChars);
+    setValue(chars.join(""));
+    setCursorPos(cursorPos + inputChars.length);
+    historyIdx.current = -1;
+    setCompletionHint(null);
+  }, { isActive });
+  function renderMultilinePreview() {
+    if (!multiLineBuffer) return null;
+    const lines = multiLineBuffer.split("\n");
+    const totalLines = lines.length;
+    const byteLen = Buffer.byteLength(multiLineBuffer, "utf8");
+    const sizeStr = byteLen >= 1024 ? `${(byteLen / 1024).toFixed(1)} KB` : `${byteLen} B`;
+    const firstNonEmpty = lines.find((l) => l.trim()) ?? "";
+    const sanitized = firstNonEmpty.replace(/[^\x20-\x7E]/g, "").trim();
+    const maxHint = Math.max(20, columns - 14);
+    const hint = sanitized.length > maxHint ? sanitized.slice(0, maxHint - 1) + "\u2026" : sanitized;
+    return /* @__PURE__ */ jsxs2(Box, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ jsxs2(Box, { gap: 1, children: [
+        /* @__PURE__ */ jsx2(Text2, { color: "cyan", children: "\u2398" }),
+        /* @__PURE__ */ jsxs2(Text2, { bold: true, children: [
+          totalLines,
+          " line",
+          totalLines !== 1 ? "s" : ""
+        ] }),
+        /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "\xB7" }),
+        /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: sizeStr }),
+        hint ? /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
+          '\xB7 "',
+          hint,
+          '"'
+        ] }) : null
+      ] }),
+      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "[Enter to send \xB7 Esc to discard]" })
+    ] });
+  }
   if (!bordered || columns < 40 || hasInkGhostingIssue()) {
-    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs(Box, { children: [
-        /* @__PURE__ */ jsxs(Text, { color: "green", bold: true, children: [
+    return /* @__PURE__ */ jsxs2(Box, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs2(Box, { children: [
+        /* @__PURE__ */ jsxs2(Text2, { color: "green", bold: true, children: [
           ">",
           " "
         ] }),
-        /* @__PURE__ */ jsx(
-          TextInput,
-          {
-            value,
-            onChange: handleChange,
-            onSubmit: handleSubmit,
-            focus: isActive
-          }
-        ),
-        multiLineBuffer && !expanded && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-          " [",
-          lineCount,
-          " lines - /expand to view, /send to submit]"
-        ] })
+        /* @__PURE__ */ jsx2(CursorText, { value, cursorPos, active: isActive })
       ] }),
-      completionHint && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      completionHint && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
         "  ",
         completionHint
       ] }),
-      expanded && multiLineBuffer && /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginLeft: 2, children: multiLineBuffer.split("\n").map((line, i) => /* @__PURE__ */ jsx(Text, { dimColor: true, children: line }, i)) })
+      renderMultilinePreview()
     ] });
   }
   const borderStyle = supportsUnicode() ? "round" : "classic";
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsx2(Box, { flexDirection: "column", children: /* @__PURE__ */ jsxs2(
     Box,
     {
       flexDirection: "column",
@@ -4932,34 +5115,18 @@ function BorderedInput({
       paddingLeft: 1,
       paddingRight: 1,
       children: [
-        /* @__PURE__ */ jsxs(Box, { children: [
-          /* @__PURE__ */ jsxs(Text, { color: "green", bold: true, children: [
+        /* @__PURE__ */ jsxs2(Box, { children: [
+          /* @__PURE__ */ jsxs2(Text2, { color: "green", bold: true, children: [
             ">",
             " "
           ] }),
-          /* @__PURE__ */ jsx(
-            TextInput,
-            {
-              value,
-              onChange: handleChange,
-              onSubmit: handleSubmit,
-              focus: isActive
-            }
-          )
+          /* @__PURE__ */ jsx2(CursorText, { value, cursorPos, active: isActive })
         ] }),
-        completionHint && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+        completionHint && /* @__PURE__ */ jsx2(Box, { children: /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
           "  ",
           completionHint
         ] }) }),
-        multiLineBuffer && !expanded && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-          "[",
-          lineCount,
-          " lines pasted - /expand to view, /send to submit]"
-        ] }) }),
-        expanded && multiLineBuffer && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
-          multiLineBuffer.split("\n").map((line, i) => /* @__PURE__ */ jsx(Text, { dimColor: true, children: line }, i)),
-          /* @__PURE__ */ jsx(Text, { dimColor: true, children: "[/send to submit, /expand to collapse]" })
-        ] })
+        renderMultilinePreview()
       ]
     }
   ) });
@@ -4967,11 +5134,11 @@ function BorderedInput({
 
 // src/cli/ui/status-bar.tsx
 import { useState as useState2, useEffect as useEffect2 } from "react";
-import { Box as Box2, Text as Text3, useStdout as useStdout2 } from "ink";
+import { Box as Box2, Text as Text4, useStdout as useStdout2 } from "ink";
 
 // src/cli/ui/context-bar.tsx
-import { Text as Text2 } from "ink";
-import { jsxs as jsxs2 } from "react/jsx-runtime";
+import { Text as Text3 } from "ink";
+import { jsxs as jsxs3 } from "react/jsx-runtime";
 function ContextBar({ percent, segments = 10 }) {
   const clamped = Math.max(0, Math.min(100, percent));
   const filled = Math.round(clamped / 100 * segments);
@@ -4985,7 +5152,7 @@ function ContextBar({ percent, segments = 10 }) {
   } else {
     color2 = "green";
   }
-  return /* @__PURE__ */ jsxs2(Text2, { color: color2, children: [
+  return /* @__PURE__ */ jsxs3(Text3, { color: color2, children: [
     "[",
     bar,
     "] ",
@@ -4995,7 +5162,7 @@ function ContextBar({ percent, segments = 10 }) {
 }
 
 // src/cli/ui/status-bar.tsx
-import { Fragment, jsx as jsx2, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs4 } from "react/jsx-runtime";
 function StatusBar({ bridge, model, sessionIdentifier, visible = true }) {
   const { stdout } = useStdout2();
   const [usage, setUsage] = useState2({
@@ -5018,19 +5185,19 @@ function StatusBar({ bridge, model, sessionIdentifier, visible = true }) {
   if (!stdout?.isTTY) return null;
   const tokens = `${usage.sessionInputTokens.toLocaleString()} in / ${usage.sessionOutputTokens.toLocaleString()} out`;
   const cost = `$${usage.sessionCost.toFixed(2)}`;
-  return /* @__PURE__ */ jsxs3(Box2, { width: "100%", justifyContent: "space-between", children: [
-    /* @__PURE__ */ jsxs3(Box2, { children: [
-      /* @__PURE__ */ jsx2(Text3, { color: "cyan", bold: true, children: model }),
-      /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: " | " }),
-      /* @__PURE__ */ jsx2(Text3, { children: tokens }),
-      /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: " | " }),
-      /* @__PURE__ */ jsx2(Text3, { color: "yellow", children: cost })
+  return /* @__PURE__ */ jsxs4(Box2, { width: "100%", justifyContent: "space-between", children: [
+    /* @__PURE__ */ jsxs4(Box2, { children: [
+      /* @__PURE__ */ jsx3(Text4, { color: "cyan", bold: true, children: model }),
+      /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: " | " }),
+      /* @__PURE__ */ jsx3(Text4, { children: tokens }),
+      /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: " | " }),
+      /* @__PURE__ */ jsx3(Text4, { color: "yellow", children: cost })
     ] }),
-    /* @__PURE__ */ jsxs3(Box2, { children: [
-      /* @__PURE__ */ jsx2(ContextBar, { percent: contextPercent }),
-      sessionIdentifier && /* @__PURE__ */ jsxs3(Fragment, { children: [
-        /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: " | " }),
-        /* @__PURE__ */ jsx2(Text3, { dimColor: true, children: sessionIdentifier })
+    /* @__PURE__ */ jsxs4(Box2, { children: [
+      /* @__PURE__ */ jsx3(ContextBar, { percent: contextPercent }),
+      sessionIdentifier && /* @__PURE__ */ jsxs4(Fragment2, { children: [
+        /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: " | " }),
+        /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: sessionIdentifier })
       ] })
     ] })
   ] });
@@ -5041,11 +5208,11 @@ import React3, { useState as useState3, useCallback as useCallback2 } from "reac
 import { Box as Box5, useInput as useInput2 } from "ink";
 
 // src/cli/ui/approval-prompt.tsx
-import { Box as Box4, Text as Text5, useStdout as useStdout3 } from "ink";
+import { Box as Box4, Text as Text6, useStdout as useStdout3 } from "ink";
 
 // src/cli/ui/diff-view.tsx
-import { Box as Box3, Text as Text4 } from "ink";
-import { jsx as jsx3, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Box as Box3, Text as Text5 } from "ink";
+import { jsx as jsx4, jsxs as jsxs5 } from "react/jsx-runtime";
 function DiffView({ diff, maxLines = 30 }) {
   let lineCount = 0;
   let truncated = false;
@@ -5059,19 +5226,19 @@ function DiffView({ diff, maxLines = 30 }) {
       lineCount++;
       if (line.startsWith("+")) {
         lines.push(
-          /* @__PURE__ */ jsx3(Text4, { backgroundColor: "green", color: "black", children: line }, `${hunkIndex}-${lineCount}`)
+          /* @__PURE__ */ jsx4(Text5, { backgroundColor: "green", color: "black", children: line }, `${hunkIndex}-${lineCount}`)
         );
       } else if (line.startsWith("-")) {
         lines.push(
-          /* @__PURE__ */ jsx3(Text4, { backgroundColor: "red", color: "black", children: line }, `${hunkIndex}-${lineCount}`)
+          /* @__PURE__ */ jsx4(Text5, { backgroundColor: "red", color: "black", children: line }, `${hunkIndex}-${lineCount}`)
         );
       } else if (line.startsWith("@@")) {
         lines.push(
-          /* @__PURE__ */ jsx3(Text4, { color: "cyan", children: line }, `${hunkIndex}-${lineCount}`)
+          /* @__PURE__ */ jsx4(Text5, { color: "cyan", children: line }, `${hunkIndex}-${lineCount}`)
         );
       } else {
         lines.push(
-          /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: line }, `${hunkIndex}-${lineCount}`)
+          /* @__PURE__ */ jsx4(Text5, { dimColor: true, children: line }, `${hunkIndex}-${lineCount}`)
         );
       }
     }
@@ -5079,14 +5246,14 @@ function DiffView({ diff, maxLines = 30 }) {
   };
   const allLines = diff.hunks.flatMap((hunk, i) => renderHunk(hunk, i));
   const totalLines = diff.hunks.reduce((sum, h) => sum + h.lines.length, 0);
-  return /* @__PURE__ */ jsxs4(Box3, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
+  return /* @__PURE__ */ jsxs5(Box3, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
       "  -- ",
       diff.filePath,
       " --"
     ] }),
     allLines,
-    truncated && /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
+    truncated && /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
       "  ...",
       totalLines - maxLines,
       " more lines"
@@ -5095,12 +5262,12 @@ function DiffView({ diff, maxLines = 30 }) {
 }
 
 // src/cli/ui/approval-prompt.tsx
-import { jsx as jsx4, jsxs as jsxs5 } from "react/jsx-runtime";
+import { jsx as jsx5, jsxs as jsxs6 } from "react/jsx-runtime";
 function ApprovalPrompt({ request, onRespond: _onRespond }) {
   const { stdout } = useStdout3();
   const columns = stdout?.columns ?? 80;
   const boxWidth = Math.min(columns - 4, 120);
-  return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsxs5(
+  return /* @__PURE__ */ jsx5(Box4, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsxs6(
     Box4,
     {
       flexDirection: "column",
@@ -5110,12 +5277,12 @@ function ApprovalPrompt({ request, onRespond: _onRespond }) {
       paddingLeft: 1,
       paddingRight: 1,
       children: [
-        /* @__PURE__ */ jsxs5(Box4, { children: [
-          /* @__PURE__ */ jsxs5(Text5, { color: "yellow", bold: true, children: [
+        /* @__PURE__ */ jsxs6(Box4, { children: [
+          /* @__PURE__ */ jsxs6(Text6, { color: "yellow", bold: true, children: [
             "\u26A0",
             " Approval required"
           ] }),
-          request.total > 1 && /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
+          request.total > 1 && /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
             " [",
             request.index + 1,
             "/",
@@ -5123,36 +5290,36 @@ function ApprovalPrompt({ request, onRespond: _onRespond }) {
             "]"
           ] })
         ] }),
-        request.warning && /* @__PURE__ */ jsxs5(Box4, { marginTop: 1, children: [
-          /* @__PURE__ */ jsxs5(Text5, { color: "red", bold: true, children: [
+        request.warning && /* @__PURE__ */ jsxs6(Box4, { marginTop: 1, children: [
+          /* @__PURE__ */ jsxs6(Text6, { color: "red", bold: true, children: [
             "\u26A0",
             " WARNING: "
           ] }),
-          /* @__PURE__ */ jsxs5(Text5, { wrap: "wrap", children: [
+          /* @__PURE__ */ jsxs6(Text6, { wrap: "wrap", children: [
             "This command accesses a sensitive system path outside the project root (",
             request.warning,
             ")"
           ] })
         ] }),
-        /* @__PURE__ */ jsxs5(Box4, { marginTop: 1, children: [
-          /* @__PURE__ */ jsxs5(Text5, { bold: true, children: [
+        /* @__PURE__ */ jsxs6(Box4, { marginTop: 1, children: [
+          /* @__PURE__ */ jsxs6(Text6, { bold: true, children: [
             request.toolName,
             ": "
           ] }),
-          /* @__PURE__ */ jsx4(Text5, { wrap: "wrap", children: request.summary })
+          /* @__PURE__ */ jsx5(Text6, { wrap: "wrap", children: request.summary })
         ] }),
-        request.diff && /* @__PURE__ */ jsx4(Box4, { marginTop: 1, children: /* @__PURE__ */ jsx4(DiffView, { diff: request.diff, maxLines: 20 }) }),
-        /* @__PURE__ */ jsxs5(Box4, { marginTop: 1, children: [
-          /* @__PURE__ */ jsx4(Text5, { color: "green", children: "[y] " }),
-          /* @__PURE__ */ jsx4(Text5, { children: "allow  " }),
-          /* @__PURE__ */ jsx4(Text5, { color: "cyan", children: "[a] " }),
-          /* @__PURE__ */ jsx4(Text5, { children: "always  " }),
-          /* @__PURE__ */ jsx4(Text5, { color: "red", children: "[n] " }),
-          /* @__PURE__ */ jsx4(Text5, { children: "deny  " }),
-          /* @__PURE__ */ jsx4(Text5, { color: "yellow", children: "[A] " }),
-          /* @__PURE__ */ jsx4(Text5, { children: "all  " }),
-          /* @__PURE__ */ jsx4(Text5, { color: "magenta", children: "[s] " }),
-          /* @__PURE__ */ jsx4(Text5, { children: "similar" })
+        request.diff && /* @__PURE__ */ jsx5(Box4, { marginTop: 1, children: /* @__PURE__ */ jsx5(DiffView, { diff: request.diff, maxLines: 20 }) }),
+        /* @__PURE__ */ jsxs6(Box4, { marginTop: 1, children: [
+          /* @__PURE__ */ jsx5(Text6, { color: "green", children: "[y] " }),
+          /* @__PURE__ */ jsx5(Text6, { children: "allow  " }),
+          /* @__PURE__ */ jsx5(Text6, { color: "cyan", children: "[a] " }),
+          /* @__PURE__ */ jsx5(Text6, { children: "always  " }),
+          /* @__PURE__ */ jsx5(Text6, { color: "red", children: "[n] " }),
+          /* @__PURE__ */ jsx5(Text6, { children: "deny  " }),
+          /* @__PURE__ */ jsx5(Text6, { color: "yellow", children: "[A] " }),
+          /* @__PURE__ */ jsx5(Text6, { children: "all  " }),
+          /* @__PURE__ */ jsx5(Text6, { color: "magenta", children: "[s] " }),
+          /* @__PURE__ */ jsx5(Text6, { children: "similar" })
         ] })
       ]
     }
@@ -5160,7 +5327,7 @@ function ApprovalPrompt({ request, onRespond: _onRespond }) {
 }
 
 // src/cli/ui/approval-handler.tsx
-import { jsx as jsx5 } from "react/jsx-runtime";
+import { jsx as jsx6 } from "react/jsx-runtime";
 function ApprovalHandler({ bridge }) {
   const [pending, setPending] = useState3(null);
   React3.useEffect(() => {
@@ -5204,7 +5371,7 @@ function ApprovalHandler({ bridge }) {
     { isActive: pending !== null }
   );
   if (!pending) return null;
-  return /* @__PURE__ */ jsx5(Box5, { children: /* @__PURE__ */ jsx5(
+  return /* @__PURE__ */ jsx6(Box5, { children: /* @__PURE__ */ jsx6(
     ApprovalPrompt,
     {
       request: pending.request,
@@ -5213,8 +5380,189 @@ function ApprovalHandler({ bridge }) {
   ) });
 }
 
+// src/cli/ui/activity-bar.tsx
+import { Text as Text7 } from "ink";
+import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+function ActivityBar({ phase, spinnerFrame, spinnerElapsed, liveTool }) {
+  if (liveTool !== null) {
+    return /* @__PURE__ */ jsxs7(Text7, { color: "green", children: [
+      "  ",
+      "\u25CF",
+      " ",
+      liveTool
+    ] });
+  }
+  if (phase === "thinking") {
+    return /* @__PURE__ */ jsxs7(Text7, { children: [
+      "  ",
+      /* @__PURE__ */ jsx7(Text7, { color: "magenta", children: spinnerFrame }),
+      " ",
+      /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
+        "thinking... ",
+        /* @__PURE__ */ jsx7(Text7, { color: "gray", children: spinnerElapsed })
+      ] })
+    ] });
+  }
+  if (phase === "streaming") {
+    return /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
+      "  ",
+      spinnerFrame,
+      " ..."
+    ] });
+  }
+  return /* @__PURE__ */ jsx7(Text7, { children: " " });
+}
+
+// src/cli/ui/suggestion-hint.tsx
+import { useState as useState4, useEffect as useEffect3 } from "react";
+import { Box as Box6, Text as Text8 } from "ink";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+var DEFAULT_RULES = [
+  {
+    id: "run-tests",
+    condition: (ctx) => ctx.editCount > 0 && ctx.hasTestFramework && ctx.lastToolNames.includes("edit"),
+    suggestion: "Run tests to verify changes?",
+    action: "run the tests for the files I just changed"
+  },
+  {
+    id: "commit-changes",
+    condition: (ctx) => ctx.editCount >= 3,
+    suggestion: "Commit these changes?",
+    action: "commit the changes with a descriptive message"
+  },
+  {
+    id: "resume-session",
+    condition: (ctx) => ctx.sessionCount > 0 && ctx.editCount === 0,
+    suggestion: "Resume previous session?",
+    action: "/session resume"
+  }
+];
+function SuggestionHint({
+  bridge,
+  enabled = true,
+  rules = DEFAULT_RULES,
+  initialContext,
+  onSuggestionChange
+}) {
+  const [context, setContext] = useState4({
+    lastToolNames: [],
+    editCount: 0,
+    hasTestFramework: false,
+    sessionCount: 0,
+    ...initialContext
+  });
+  useEffect3(() => {
+    const onToolComplete = (tool) => {
+      setContext((prev) => ({
+        ...prev,
+        lastToolNames: [...prev.lastToolNames.slice(-5), tool.name],
+        editCount: tool.name === "edit" || tool.name === "write" ? prev.editCount + 1 : prev.editCount
+      }));
+    };
+    const onTurnComplete = () => {
+      setContext((prev) => ({ ...prev, lastToolNames: [] }));
+    };
+    bridge.on("tool-complete", onToolComplete);
+    bridge.on("turn-complete", onTurnComplete);
+    return () => {
+      bridge.off("tool-complete", onToolComplete);
+      bridge.off("turn-complete", onTurnComplete);
+    };
+  }, [bridge]);
+  const activeSuggestion = enabled ? rules.find((rule) => rule.condition(context)) ?? null : null;
+  useEffect3(() => {
+    onSuggestionChange?.(activeSuggestion);
+  }, [activeSuggestion, onSuggestionChange]);
+  if (!enabled || activeSuggestion === null) return null;
+  return /* @__PURE__ */ jsx8(Box6, { marginLeft: 2, children: /* @__PURE__ */ jsxs8(Text8, { dimColor: true, italic: true, children: [
+    activeSuggestion.suggestion,
+    " [Tab to accept]"
+  ] }) });
+}
+
+// src/cli/ui/history-search.tsx
+import { useState as useState5, useMemo } from "react";
+import { Box as Box7, Text as Text9, useInput as useInput3 } from "ink";
+import TextInput from "ink-text-input";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+function HistorySearch({ history, visible, onSelect, onDismiss }) {
+  const [query, setQuery] = useState5("");
+  const [selectedIndex, setSelectedIndex] = useState5(0);
+  const filtered = useMemo(() => {
+    if (!query) return history.slice(0, 20);
+    const lowerQuery = query.toLowerCase();
+    return history.filter((entry) => {
+      const lower = entry.toLowerCase();
+      let qi = 0;
+      for (let i = 0; i < lower.length && qi < lowerQuery.length; i++) {
+        if (lower[i] === lowerQuery[qi]) qi++;
+      }
+      return qi === lowerQuery.length;
+    }).slice(0, 20);
+  }, [history, query]);
+  useInput3(
+    (_input, key) => {
+      if (!visible) return;
+      if (key.escape) {
+        setQuery("");
+        setSelectedIndex(0);
+        onDismiss();
+        return;
+      }
+      if (key.return) {
+        if (filtered.length > 0) {
+          onSelect(filtered[selectedIndex]);
+        }
+        setQuery("");
+        setSelectedIndex(0);
+        return;
+      }
+      if (key.upArrow) {
+        setSelectedIndex((prev) => Math.max(prev - 1, 0));
+        return;
+      }
+      if (key.downArrow) {
+        setSelectedIndex((prev) => Math.min(prev + 1, filtered.length - 1));
+        return;
+      }
+    },
+    { isActive: visible }
+  );
+  if (!visible) return null;
+  const maxVisible = 10;
+  const displayItems = filtered.slice(0, maxVisible);
+  return /* @__PURE__ */ jsxs9(Box7, { flexDirection: "column", borderStyle: "single", borderColor: "yellow", paddingLeft: 1, paddingRight: 1, children: [
+    /* @__PURE__ */ jsxs9(Box7, { children: [
+      /* @__PURE__ */ jsx9(Text9, { color: "yellow", bold: true, children: "reverse-i-search: " }),
+      /* @__PURE__ */ jsx9(TextInput, { value: query, onChange: (v) => {
+        setQuery(v);
+        setSelectedIndex(0);
+      }, focus: visible })
+    ] }),
+    displayItems.length > 0 ? /* @__PURE__ */ jsxs9(Box7, { flexDirection: "column", marginTop: 1, children: [
+      displayItems.map((entry, i) => /* @__PURE__ */ jsxs9(
+        Text9,
+        {
+          color: i === selectedIndex ? "cyan" : void 0,
+          bold: i === selectedIndex,
+          children: [
+            i === selectedIndex ? "> " : "  ",
+            entry
+          ]
+        },
+        i
+      )),
+      filtered.length > maxVisible && /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
+        "  ...",
+        filtered.length - maxVisible,
+        " more matches"
+      ] })
+    ] }) : /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "  No matches" })
+  ] });
+}
+
 // src/cli/ui/app.tsx
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 var DEFAULT_UI_CONFIG = {
   bordered_input: true,
   status_bar: true,
@@ -5227,10 +5575,10 @@ var DEFAULT_UI_CONFIG = {
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var SPINNER_INTERVAL = 80;
 function useSpinner(active) {
-  const [frameIdx, setFrameIdx] = useState4(0);
-  const [elapsed, setElapsed] = useState4(0);
+  const [frameIdx, setFrameIdx] = useState6(0);
+  const [elapsed, setElapsed] = useState6(0);
   const startTime = useRef2(0);
-  useEffect3(() => {
+  useEffect4(() => {
     if (!active) {
       setFrameIdx(0);
       setElapsed(0);
@@ -5254,19 +5602,19 @@ function renderInline(text) {
   while (remaining.length > 0) {
     const boldMatch = remaining.match(/^\*\*(.+?)\*\*/);
     if (boldMatch) {
-      parts.push(/* @__PURE__ */ jsx6(Text6, { bold: true, children: boldMatch[1] }, key++));
+      parts.push(/* @__PURE__ */ jsx10(Text10, { bold: true, children: boldMatch[1] }, key++));
       remaining = remaining.slice(boldMatch[0].length);
       continue;
     }
     const italicMatch = remaining.match(/^\*(.+?)\*/);
     if (italicMatch) {
-      parts.push(/* @__PURE__ */ jsx6(Text6, { italic: true, children: italicMatch[1] }, key++));
+      parts.push(/* @__PURE__ */ jsx10(Text10, { italic: true, children: italicMatch[1] }, key++));
       remaining = remaining.slice(italicMatch[0].length);
       continue;
     }
     const codeMatch = remaining.match(/^`([^`]+)`/);
     if (codeMatch) {
-      parts.push(/* @__PURE__ */ jsx6(Text6, { color: "cyan", bold: true, children: codeMatch[1] }, key++));
+      parts.push(/* @__PURE__ */ jsx10(Text10, { color: "cyan", bold: true, children: codeMatch[1] }, key++));
       remaining = remaining.slice(codeMatch[0].length);
       continue;
     }
@@ -5283,7 +5631,7 @@ function renderInline(text) {
       remaining = remaining.slice(nextSpecial);
     }
   }
-  return parts.length === 1 ? parts[0] : /* @__PURE__ */ jsx6(Fragment2, { children: parts });
+  return parts.length === 1 ? parts[0] : /* @__PURE__ */ jsx10(Fragment3, { children: parts });
 }
 function renderMarkdownBlocks(text) {
   const lines = text.split("\n");
@@ -5303,9 +5651,9 @@ function renderMarkdownBlocks(text) {
       }
       if (i < lines.length) i++;
       elements.push(
-        /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", marginY: 1, children: [
-          lang && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: lang }),
-          /* @__PURE__ */ jsx6(Box6, { borderStyle: "single", borderColor: "gray", paddingX: 1, flexDirection: "column", children: codeLines.map((cl, ci) => /* @__PURE__ */ jsx6(Text6, { color: "white", children: cl }, ci)) })
+        /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", marginY: 1, children: [
+          lang && /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: lang }),
+          /* @__PURE__ */ jsx10(Box8, { borderStyle: "single", borderColor: "gray", paddingX: 1, flexDirection: "column", children: codeLines.map((cl, ci) => /* @__PURE__ */ jsx10(Text10, { color: "white", children: cl }, ci)) })
         ] }, key++)
       );
       continue;
@@ -5315,7 +5663,7 @@ function renderMarkdownBlocks(text) {
       const level = headerMatch[1].length;
       const content = headerMatch[2];
       elements.push(
-        /* @__PURE__ */ jsxs6(Text6, { bold: true, color: level <= 2 ? "white" : void 0, children: [
+        /* @__PURE__ */ jsxs10(Text10, { bold: true, color: level <= 2 ? "white" : void 0, children: [
           level <= 2 ? "\n" : "",
           content
         ] }, key++)
@@ -5325,7 +5673,7 @@ function renderMarkdownBlocks(text) {
     }
     if (/^[-*_]{3,}$/.test(trimmed)) {
       elements.push(
-        /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "\u2500".repeat(40) }, key++)
+        /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: "\u2500".repeat(40) }, key++)
       );
       i++;
       continue;
@@ -5333,7 +5681,7 @@ function renderMarkdownBlocks(text) {
     const ulMatch = trimmed.match(/^[-*+]\s+(.*)/);
     if (ulMatch) {
       elements.push(
-        /* @__PURE__ */ jsxs6(Text6, { wrap: "wrap", children: [
+        /* @__PURE__ */ jsxs10(Text10, { wrap: "wrap", children: [
           "  ",
           "\u2022",
           " ",
@@ -5346,7 +5694,7 @@ function renderMarkdownBlocks(text) {
     const olMatch = trimmed.match(/^(\d+)[.)]\s+(.*)/);
     if (olMatch) {
       elements.push(
-        /* @__PURE__ */ jsxs6(Text6, { wrap: "wrap", children: [
+        /* @__PURE__ */ jsxs10(Text10, { wrap: "wrap", children: [
           "  ",
           olMatch[1],
           ". ",
@@ -5359,7 +5707,7 @@ function renderMarkdownBlocks(text) {
     if (trimmed.startsWith(">")) {
       const content = trimmed.replace(/^>\s?/, "");
       elements.push(
-        /* @__PURE__ */ jsxs6(Text6, { dimColor: true, wrap: "wrap", children: [
+        /* @__PURE__ */ jsxs10(Text10, { dimColor: true, wrap: "wrap", children: [
           "  ",
           "\u2502",
           " ",
@@ -5374,7 +5722,7 @@ function renderMarkdownBlocks(text) {
       continue;
     }
     elements.push(
-      /* @__PURE__ */ jsx6(Text6, { wrap: "wrap", children: renderInline(line) }, key++)
+      /* @__PURE__ */ jsx10(Text10, { wrap: "wrap", children: renderInline(line) }, key++)
     );
     i++;
   }
@@ -5390,17 +5738,18 @@ var CopairApp = forwardRef(function CopairApp2({
   onMessage,
   onHistoryAppend,
   onSlashCommand,
-  onExit: _onExit
+  onExit: _onExit,
+  initialContext
 }, ref) {
   const config = { ...DEFAULT_UI_CONFIG, ...uiOverrides };
   const { exit } = useApp();
   const ctrlCCount = useRef2(0);
   const ctrlCTimer = useRef2(null);
   const nextId = useRef2(0);
-  const [staticItems, setStaticItems] = useState4([]);
-  const [liveText, setLiveText] = useState4("");
-  const [liveTool, setLiveTool] = useState4(null);
-  const [state, setState] = useState4({
+  const [staticItems, setStaticItems] = useState6([]);
+  const [liveText, setLiveText] = useState6("");
+  const [liveTool, setLiveTool] = useState6(null);
+  const [state, setState] = useState6({
     phase: "input",
     model,
     sessionIdentifier: sessionIdentifier ?? "",
@@ -5415,7 +5764,11 @@ var CopairApp = forwardRef(function CopairApp2({
     contextWindowPercent: 0,
     notification: null
   });
-  const spinner = useSpinner(state.phase === "thinking");
+  const spinner = useSpinner(state.phase === "thinking" || state.phase === "streaming");
+  const [activeSuggestion, setActiveSuggestion] = useState6(null);
+  const [historySearchVisible, setHistorySearchVisible] = useState6(false);
+  const [injectedInput, setInjectedInput] = useState6(void 0);
+  const injectedNonce = useRef2(0);
   useImperativeHandle(ref, () => ({
     updateModel: (newModel) => {
       setState((prev) => ({ ...prev, model: newModel }));
@@ -5424,7 +5777,7 @@ var CopairApp = forwardRef(function CopairApp2({
       setState((prev) => ({ ...prev, sessionIdentifier: id }));
     }
   }));
-  useInput3((_input, key) => {
+  useInput4((_input, key) => {
     if (key.ctrl && _input === "c") {
       ctrlCCount.current++;
       if (ctrlCCount.current >= 2) {
@@ -5440,7 +5793,7 @@ var CopairApp = forwardRef(function CopairApp2({
       }, 2e3);
     }
   });
-  useEffect3(() => {
+  useEffect4(() => {
     const onStreamText = (text) => {
       setState((prev) => prev.phase === "thinking" ? { ...prev, phase: "streaming" } : prev);
       setLiveText((prev) => prev + text);
@@ -5543,48 +5896,71 @@ var CopairApp = forwardRef(function CopairApp2({
       setState((prev) => ({ ...prev, phase: "input" }));
     });
   }, [onMessage, bridge]);
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Static, { items: staticItems, children: (item) => {
+  const handleSlashCommand = useCallback3(async (command, args) => {
+    if (command === "history-search") {
+      setHistorySearchVisible(true);
+      return;
+    }
+    await onSlashCommand?.(command, args);
+  }, [onSlashCommand]);
+  return /* @__PURE__ */ jsxs10(Box8, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx10(Static, { items: staticItems, children: (item) => {
       switch (item.type) {
         case "user":
-          return /* @__PURE__ */ jsxs6(Text6, { color: "cyan", bold: true, children: [
+          return /* @__PURE__ */ jsxs10(Text10, { color: "cyan", bold: true, children: [
             "\u276F",
             " ",
             item.content
           ] }, item.id);
         case "error":
-          return /* @__PURE__ */ jsx6(Text6, { color: "red", children: item.content }, item.id);
+          return /* @__PURE__ */ jsx10(Text10, { color: "red", children: item.content }, item.id);
         case "tool":
-          return /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
+          return /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
             "  ",
             item.content
           ] }, item.id);
         case "diff":
-          return item.diff ? /* @__PURE__ */ jsx6(DiffView, { diff: item.diff }, item.id) : null;
+          return item.diff ? /* @__PURE__ */ jsx10(DiffView, { diff: item.diff }, item.id) : null;
         case "text":
         default:
-          return /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", children: renderMarkdownBlocks(item.content) }, item.id);
+          return /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", children: renderMarkdownBlocks(item.content) }, item.id);
       }
     } }),
-    state.phase === "thinking" && /* @__PURE__ */ jsxs6(Text6, { children: [
-      "  ",
-      /* @__PURE__ */ jsx6(Text6, { color: "magenta", children: spinner.frame }),
-      " ",
-      /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
-        "thinking... ",
-        /* @__PURE__ */ jsx6(Text6, { color: "gray", children: spinner.elapsed })
-      ] })
-    ] }),
-    liveText && /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", children: renderMarkdownBlocks(liveText) }),
-    liveTool && /* @__PURE__ */ jsxs6(Text6, { color: "green", children: [
-      "  ",
-      "\u25CF",
-      " ",
-      liveTool
-    ] }),
-    /* @__PURE__ */ jsx6(ApprovalHandler, { bridge }),
-    state.notification && /* @__PURE__ */ jsx6(Text6, { color: "yellow", children: state.notification }),
-    state.phase === "input" ? /* @__PURE__ */ jsx6(
+    liveText && /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", children: renderMarkdownBlocks(liveText) }),
+    /* @__PURE__ */ jsx10(
+      ActivityBar,
+      {
+        phase: state.phase,
+        spinnerFrame: spinner.frame,
+        spinnerElapsed: spinner.elapsed,
+        liveTool
+      }
+    ),
+    config.suggestions && /* @__PURE__ */ jsx10(
+      SuggestionHint,
+      {
+        bridge,
+        enabled: config.suggestions,
+        onSuggestionChange: setActiveSuggestion,
+        initialContext
+      }
+    ),
+    /* @__PURE__ */ jsx10(
+      HistorySearch,
+      {
+        history: history ?? [],
+        visible: historySearchVisible,
+        onSelect: (selected) => {
+          setHistorySearchVisible(false);
+          injectedNonce.current += 1;
+          setInjectedInput({ value: selected, nonce: injectedNonce.current });
+        },
+        onDismiss: () => setHistorySearchVisible(false)
+      }
+    ),
+    /* @__PURE__ */ jsx10(ApprovalHandler, { bridge }),
+    state.notification && /* @__PURE__ */ jsx10(Text10, { color: "yellow", children: state.notification }),
+    state.phase === "input" && !historySearchVisible ? /* @__PURE__ */ jsx10(
       BorderedInput,
       {
         sessionIdentifier: state.sessionIdentifier,
@@ -5594,10 +5970,12 @@ var CopairApp = forwardRef(function CopairApp2({
         completionEngine,
         onSubmit: handleSubmit,
         onHistoryAppend,
-        onSlashCommand
+        onSlashCommand: handleSlashCommand,
+        activeSuggestion,
+        injectedValue: injectedInput
       }
     ) : null,
-    /* @__PURE__ */ jsx6(
+    /* @__PURE__ */ jsx10(
       StatusBar,
       {
         bridge,
@@ -5614,7 +5992,7 @@ function renderApp(bridge, model, options) {
     imperativeHandle = handle;
   };
   const instance = render(
-    /* @__PURE__ */ jsx6(
+    /* @__PURE__ */ jsx10(
       CopairApp,
       {
         ref: appRef,
@@ -5627,7 +6005,8 @@ function renderApp(bridge, model, options) {
         onMessage: options?.onMessage,
         onHistoryAppend: options?.onHistoryAppend,
         onSlashCommand: options?.onSlashCommand,
-        onExit: options?.onExit
+        onExit: options?.onExit,
+        initialContext: options?.initialContext
       }
     ),
     { exitOnCtrlC: false }
@@ -5975,7 +6354,7 @@ import chalk6 from "chalk";
 // package.json
 var package_default = {
   name: "@dugleelabs/copair",
-  version: "1.2.0",
+  version: "1.3.0",
   description: "Model-agnostic AI coding agent for the terminal",
   type: "module",
   main: "dist/index.js",
@@ -6815,6 +7194,23 @@ async function runAuditCommand(argv) {
 }
 
 // src/index.ts
+function detectTestFramework(cwd) {
+  const patterns = [
+    "vitest.config.ts",
+    "vitest.config.js",
+    "vitest.config.mjs",
+    "jest.config.ts",
+    "jest.config.js",
+    "jest.config.mjs"
+  ];
+  if (patterns.some((f) => existsSync18(join15(cwd, f)))) return true;
+  try {
+    const pkg3 = JSON.parse(readFileSync10(join15(cwd, "package.json"), "utf8"));
+    return Boolean(pkg3.scripts?.test);
+  } catch {
+    return false;
+  }
+}
 function resolveModel(config, modelOverride) {
   const modelAlias = modelOverride ?? config.default_model;
   if (!modelAlias) {
@@ -6906,19 +7302,6 @@ async function main() {
   const agentBridge = new AgentBridge();
   gate.setBridge(agentBridge);
   const mcpManager = new McpClientManager();
-  if (config.mcp_servers.length > 0) {
-    setImmediate(async () => {
-      try {
-        await mcpManager.initialize(config.mcp_servers);
-        const bridge = new McpBridge(mcpManager, toolRegistry);
-        await bridge.registerAll();
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        process.stderr.write(`[mcp] Failed to initialize MCP servers: ${msg}
-`);
-      }
-    });
-  }
   gate.addTrustedPath(join15(cwd, ".copair"));
   const gitCtx = detectGitContext(cwd);
   const knowledgeManager = new KnowledgeManager({
@@ -7060,6 +7443,12 @@ Environment:
     uiConfig: config.ui,
     history: inputHistory,
     completionEngine,
+    initialContext: {
+      hasTestFramework: detectTestFramework(cwd),
+      // Session picker already ran before ink — user chose resume or fresh.
+      // No need to re-suggest resuming.
+      sessionCount: 0
+    },
     onHistoryAppend: (entry) => {
       inputHistory.push(entry);
       appendHistory(historyPath, entry);
@@ -7146,6 +7535,18 @@ Environment:
       agentBridge.emit("turn-complete");
     }
   });
+  if (config.mcp_servers.length > 0) {
+    setImmediate(async () => {
+      try {
+        await mcpManager.initialize(config.mcp_servers);
+        const bridge = new McpBridge(mcpManager, toolRegistry);
+        await bridge.registerAll();
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        agentBridge.emit("error", `[mcp] Failed to initialize MCP servers: ${msg}`);
+      }
+    });
+  }
   await appHandle.waitForExit().then(doExit);
 }
 if (process.argv[2] === "audit") {