codemaxxing 0.1.7 → 0.1.9

package/src/index.tsx

@@ -6,13 +6,13 @@ import { EventEmitter } from "events";
 import TextInput from "ink-text-input";
 import { CodingAgent } from "./agent.js";
 import { loadConfig, detectLocalProvider, parseCLIArgs, applyOverrides, listModels } from "./config.js";
-import { listSessions, getSession, loadMessages } from "./utils/sessions.js";
+import { listSessions, getSession, loadMessages, deleteSession } from "./utils/sessions.js";
 import { execSync } from "child_process";
 import { isGitRepo, getBranch, getStatus, getDiff, undoLastCommit } from "./utils/git.js";
 import { getTheme, listThemes, THEMES, DEFAULT_THEME, type Theme } from "./themes.js";
 import { PROVIDERS, getCredentials, openRouterOAuth, anthropicSetupToken, importCodexToken, importQwenToken, copilotDeviceFlow, saveApiKey } from "./utils/auth.js";
 
-const VERSION = "0.1.5";
+const VERSION = "0.1.9";
 
 // ── Helpers ──
 function formatTimeAgo(date: Date): string {
@@ -43,6 +43,7 @@ const SLASH_COMMANDS = [
   { cmd: "/theme", desc: "switch color theme" },
   { cmd: "/model", desc: "switch model mid-session" },
   { cmd: "/sessions", desc: "list past sessions" },
+  { cmd: "/session delete", desc: "delete a session" },
   { cmd: "/resume", desc: "resume a past session" },
   { cmd: "/quit", desc: "exit" },
 ];
@@ -135,11 +136,17 @@ function App() {
   const [sessionPickerIndex, setSessionPickerIndex] = useState(0);
   const [themePicker, setThemePicker] = useState(false);
   const [themePickerIndex, setThemePickerIndex] = useState(0);
+  const [deleteSessionPicker, setDeleteSessionPicker] = useState<Array<{ id: string; display: string }> | null>(null);
+  const [deleteSessionPickerIndex, setDeleteSessionPickerIndex] = useState(0);
+  const [deleteSessionConfirm, setDeleteSessionConfirm] = useState<{ id: string; display: string } | null>(null);
   const [loginPicker, setLoginPicker] = useState(false);
   const [loginPickerIndex, setLoginPickerIndex] = useState(0);
+  const [loginMethodPicker, setLoginMethodPicker] = useState<{ provider: string; methods: string[] } | null>(null);
+  const [loginMethodIndex, setLoginMethodIndex] = useState(0);
   const [approval, setApproval] = useState<{
     tool: string;
     args: Record<string, unknown>;
+    diff?: string;
     resolve: (decision: "yes" | "no" | "always") => void;
   } | null>(null);
 
@@ -247,9 +254,15 @@ function App() {
         onGitCommit: (message) => {
           addMsg("info", `📝 Auto-committed: ${message}`);
         },
-        onToolApproval: (name, args) => {
+        onContextCompressed: (oldTokens, newTokens) => {
+          const saved = oldTokens - newTokens;
+          const savedStr = saved >= 1000 ? `${(saved / 1000).toFixed(1)}k` : String(saved);
+          addMsg("info", `📦 Context compressed (~${savedStr} tokens freed)`);
+        },
+        contextCompressionThreshold: config.defaults.contextCompressionThreshold,
+        onToolApproval: (name, args, diff) => {
           return new Promise((resolve) => {
-            setApproval({ tool: name, args, resolve });
+            setApproval({ tool: name, args, diff, resolve });
             setLoading(false);
           });
         },
@@ -296,7 +309,7 @@ function App() {
       const selected = matches[idx];
       if (selected) {
         // Commands that need args (like /commit, /model) — fill input instead of executing
-        if (selected.cmd === "/commit" || selected.cmd === "/model") {
+        if (selected.cmd === "/commit" || selected.cmd === "/model" || selected.cmd === "/session delete") {
           setInput(selected.cmd + " ");
           setCmdIndex(0);
           setInputKey((k) => k + 1);
@@ -341,6 +354,7 @@ function App() {
         "  /models    — list available models",
         "  /map       — show repository map",
         "  /sessions  — list past sessions",
+        "  /session delete — delete a session",
         "  /resume    — resume a past session",
         "  /reset     — clear conversation",
         "  /context   — show message count",
@@ -451,12 +465,50 @@ function App() {
           const tokens = s.token_estimate >= 1000
             ? `${(s.token_estimate / 1000).toFixed(1)}k`
             : String(s.token_estimate);
-          return `  ${s.id}  ${dir}/  ${s.message_count} msgs  ~${tokens} tok  ${ago}  ${s.model}`;
+          const cost = s.estimated_cost > 0
+            ? `$${s.estimated_cost < 0.01 ? s.estimated_cost.toFixed(4) : s.estimated_cost.toFixed(2)}`
+            : "";
+          return `  ${s.id}  ${dir}/  ${s.message_count} msgs  ~${tokens} tok${cost ? `  ${cost}` : ""}  ${ago}  ${s.model}`;
         });
         addMsg("info", "Recent sessions:\n" + lines.join("\n") + "\n\n  Use /resume <id> to continue a session");
       }
       return;
     }
+    if (trimmed.startsWith("/session delete")) {
+      const idArg = trimmed.replace("/session delete", "").trim();
+      if (idArg) {
+        // Direct delete by ID
+        const session = getSession(idArg);
+        if (!session) {
+          addMsg("error", `Session "${idArg}" not found.`);
+          return;
+        }
+        const dir = session.cwd.split("/").pop() || session.cwd;
+        setDeleteSessionConfirm({ id: idArg, display: `${idArg}  ${dir}/  ${session.message_count} msgs  ${session.model}` });
+        return;
+      }
+      // Show picker
+      const sessions = listSessions(10);
+      if (sessions.length === 0) {
+        addMsg("info", "No sessions to delete.");
+        return;
+      }
+      const items = sessions.map((s) => {
+        const date = new Date(s.updated_at + "Z");
+        const ago = formatTimeAgo(date);
+        const dir = s.cwd.split("/").pop() || s.cwd;
+        const tokens = s.token_estimate >= 1000
+          ? `${(s.token_estimate / 1000).toFixed(1)}k`
+          : String(s.token_estimate);
+        return {
+          id: s.id,
+          display: `${s.id}  ${dir}/  ${s.message_count} msgs  ~${tokens} tok  ${ago}  ${s.model}`,
+        };
+      });
+      setDeleteSessionPicker(items);
+      setDeleteSessionPickerIndex(0);
+      return;
+    }
     if (trimmed === "/resume") {
       const sessions = listSessions(10);
       if (sessions.length === 0) {
@@ -543,77 +595,115 @@ function App() {
       }
     }
 
-    // Login picker navigation
-    if (loginPicker) {
-      const loginProviders = PROVIDERS.filter((p) => p.id !== "local");
+    // Login method picker navigation (second level — pick auth method)
+    if (loginMethodPicker) {
+      const methods = loginMethodPicker.methods;
       if (key.upArrow) {
-        setLoginPickerIndex((prev: number) => (prev - 1 + loginProviders.length) % loginProviders.length);
+        setLoginMethodIndex((prev: number) => (prev - 1 + methods.length) % methods.length);
         return;
       }
       if (key.downArrow) {
-        setLoginPickerIndex((prev: number) => (prev + 1) % loginProviders.length);
+        setLoginMethodIndex((prev: number) => (prev + 1) % methods.length);
+        return;
+      }
+      if (key.escape) {
+        setLoginMethodPicker(null);
+        setLoginPicker(true); // go back to provider picker
         return;
       }
       if (key.return) {
-        const selected = loginProviders[loginPickerIndex];
-        setLoginPicker(false);
+        const method = methods[loginMethodIndex];
+        const providerId = loginMethodPicker.provider;
+        setLoginMethodPicker(null);
 
-        if (selected.id === "openrouter") {
+        if (method === "oauth" && providerId === "openrouter") {
           addMsg("info", "Starting OpenRouter OAuth — opening browser...");
           setLoading(true);
           setSpinnerMsg("Waiting for authorization...");
           openRouterOAuth((msg: string) => addMsg("info", msg))
-            .then((cred) => {
-              addMsg("info", `✅ OpenRouter authenticated! You now have access to 200+ models.`);
-              addMsg("info", `Switch with: /model anthropic/claude-sonnet-4`);
+            .then(() => {
+              addMsg("info", `✅ OpenRouter authenticated! Access to 200+ models.`);
               setLoading(false);
             })
-            .catch((err: any) => {
-              addMsg("error", `OAuth failed: ${err.message}`);
-              setLoading(false);
-            });
-        } else if (selected.id === "anthropic") {
-          addMsg("info", "Starting Anthropic setup-token flow...");
+            .catch((err: any) => { addMsg("error", `OAuth failed: ${err.message}`); setLoading(false); });
+        } else if (method === "setup-token") {
+          addMsg("info", "Starting setup-token flow — browser will open...");
           setLoading(true);
           setSpinnerMsg("Waiting for Claude Code auth...");
           anthropicSetupToken((msg: string) => addMsg("info", msg))
-            .then((cred) => {
-              addMsg("info", `✅ Anthropic authenticated! (${cred.label})`);
-              setLoading(false);
-            })
-            .catch((err: any) => {
-              addMsg("error", `Anthropic auth failed: ${err.message}`);
-              setLoading(false);
-            });
-        } else if (selected.id === "openai") {
+            .then((cred) => { addMsg("info", `✅ Anthropic authenticated! (${cred.label})`); setLoading(false); })
+            .catch((err: any) => { addMsg("error", `Auth failed: ${err.message}`); setLoading(false); });
+        } else if (method === "cached-token" && providerId === "openai") {
           const imported = importCodexToken((msg: string) => addMsg("info", msg));
-          if (imported) {
-            addMsg("info", `✅ Imported Codex credentials! (${imported.label})`);
-          } else {
-            addMsg("info", "No Codex CLI found. Run: codemaxxing auth api-key openai <your-key>");
-          }
-        } else if (selected.id === "qwen") {
+          if (imported) { addMsg("info", `✅ Imported Codex credentials! (${imported.label})`); }
+          else { addMsg("info", "No Codex CLI found. Install Codex CLI and sign in first."); }
+        } else if (method === "cached-token" && providerId === "qwen") {
           const imported = importQwenToken((msg: string) => addMsg("info", msg));
-          if (imported) {
-            addMsg("info", `✅ Imported Qwen credentials! (${imported.label})`);
-          } else {
-            addMsg("info", "No Qwen CLI found. Run: codemaxxing auth api-key qwen <your-key>");
-          }
-        } else if (selected.id === "copilot") {
+          if (imported) { addMsg("info", `✅ Imported Qwen credentials! (${imported.label})`); }
+          else { addMsg("info", "No Qwen CLI found. Install Qwen CLI and sign in first."); }
+        } else if (method === "device-flow") {
           addMsg("info", "Starting GitHub Copilot device flow...");
           setLoading(true);
           setSpinnerMsg("Waiting for GitHub authorization...");
           copilotDeviceFlow((msg: string) => addMsg("info", msg))
-            .then(() => {
-              addMsg("info", `✅ GitHub Copilot authenticated!`);
-              setLoading(false);
-            })
-            .catch((err: any) => {
-              addMsg("error", `Copilot auth failed: ${err.message}`);
-              setLoading(false);
-            });
+            .then(() => { addMsg("info", `✅ GitHub Copilot authenticated!`); setLoading(false); })
+            .catch((err: any) => { addMsg("error", `Copilot auth failed: ${err.message}`); setLoading(false); });
+        } else if (method === "api-key") {
+          const provider = PROVIDERS.find((p) => p.id === providerId);
+          addMsg("info", `Enter your API key via CLI:\n  codemaxxing auth api-key ${providerId} <your-key>\n  Get key at: ${provider?.consoleUrl ?? "your provider's dashboard"}`);
+        }
+        return;
+      }
+      return;
+    }
+
+    // Login picker navigation (first level — pick provider)
+    if (loginPicker) {
+      const loginProviders = PROVIDERS.filter((p) => p.id !== "local");
+      if (key.upArrow) {
+        setLoginPickerIndex((prev: number) => (prev - 1 + loginProviders.length) % loginProviders.length);
+        return;
+      }
+      if (key.downArrow) {
+        setLoginPickerIndex((prev: number) => (prev + 1) % loginProviders.length);
+        return;
+      }
+      if (key.return) {
+        const selected = loginProviders[loginPickerIndex];
+        setLoginPicker(false);
+
+        // Get available methods for this provider (filter out 'none')
+        const methods = selected.methods.filter((m) => m !== "none");
+
+        if (methods.length === 1) {
+          // Only one method — execute it directly
+          setLoginMethodPicker({ provider: selected.id, methods });
+          setLoginMethodIndex(0);
+          // Simulate Enter press on the single method
+          if (methods[0] === "oauth" && selected.id === "openrouter") {
+            setLoginMethodPicker(null);
+            addMsg("info", "Starting OpenRouter OAuth — opening browser...");
+            setLoading(true);
+            setSpinnerMsg("Waiting for authorization...");
+            openRouterOAuth((msg: string) => addMsg("info", msg))
+              .then(() => { addMsg("info", `✅ OpenRouter authenticated! Access to 200+ models.`); setLoading(false); })
+              .catch((err: any) => { addMsg("error", `OAuth failed: ${err.message}`); setLoading(false); });
+          } else if (methods[0] === "device-flow") {
+            setLoginMethodPicker(null);
+            addMsg("info", "Starting GitHub Copilot device flow...");
+            setLoading(true);
+            setSpinnerMsg("Waiting for GitHub authorization...");
+            copilotDeviceFlow((msg: string) => addMsg("info", msg))
+              .then(() => { addMsg("info", `✅ GitHub Copilot authenticated!`); setLoading(false); })
+              .catch((err: any) => { addMsg("error", `Copilot auth failed: ${err.message}`); setLoading(false); });
+          } else if (methods[0] === "api-key") {
+            setLoginMethodPicker(null);
+            addMsg("info", `Enter your API key via CLI:\n  codemaxxing auth api-key ${selected.id} <your-key>\n  Get key at: ${selected.consoleUrl ?? "your provider's dashboard"}`);
+          }
         } else {
-          addMsg("info", `Run: codemaxxing auth api-key ${selected.id} <your-key>\n  Get key at: ${selected.consoleUrl ?? selected.baseUrl}`);
+          // Multiple methods — show submenu
+          setLoginMethodPicker({ provider: selected.id, methods });
+          setLoginMethodIndex(0);
         }
         return;
       }
@@ -693,6 +783,54 @@ function App() {
       return; // Ignore other keys during session picker
     }
 
+    // Delete session confirmation (y/n)
+    if (deleteSessionConfirm) {
+      if (inputChar === "y" || inputChar === "Y") {
+        const deleted = deleteSession(deleteSessionConfirm.id);
+        if (deleted) {
+          addMsg("info", `✅ Deleted session ${deleteSessionConfirm.id}`);
+        } else {
+          addMsg("error", `Failed to delete session ${deleteSessionConfirm.id}`);
+        }
+        setDeleteSessionConfirm(null);
+        return;
+      }
+      if (inputChar === "n" || inputChar === "N" || key.escape) {
+        addMsg("info", "Delete cancelled.");
+        setDeleteSessionConfirm(null);
+        return;
+      }
+      return;
+    }
+
+    // Delete session picker navigation
+    if (deleteSessionPicker) {
+      if (key.upArrow) {
+        setDeleteSessionPickerIndex((prev) => (prev - 1 + deleteSessionPicker.length) % deleteSessionPicker.length);
+        return;
+      }
+      if (key.downArrow) {
+        setDeleteSessionPickerIndex((prev) => (prev + 1) % deleteSessionPicker.length);
+        return;
+      }
+      if (key.return) {
+        const selected = deleteSessionPicker[deleteSessionPickerIndex];
+        if (selected) {
+          setDeleteSessionPicker(null);
+          setDeleteSessionPickerIndex(0);
+          setDeleteSessionConfirm(selected);
+        }
+        return;
+      }
+      if (key.escape) {
+        setDeleteSessionPicker(null);
+        setDeleteSessionPickerIndex(0);
+        addMsg("info", "Delete cancelled.");
+        return;
+      }
+      return;
+    }
+
     // Backspace with empty input → remove last paste chunk
     if (key.backspace || key.delete) {
       if (input === "" && pastedChunksRef.current.length > 0) {
@@ -844,6 +982,21 @@ function App() {
           {approval.tool === "write_file" && approval.args.content ? (
             <Text color={theme.colors.muted}>{"  "}{String(approval.args.content).split("\n").length}{" lines, "}{String(approval.args.content).length}{"B"}</Text>
           ) : null}
+          {approval.diff ? (
+            <Box flexDirection="column" marginTop={0} marginLeft={2}>
+              {approval.diff.split("\n").slice(0, 40).map((line, i) => (
+                <Text key={i} color={
+                  line.startsWith("+") ? theme.colors.success :
+                  line.startsWith("-") ? theme.colors.error :
+                  line.startsWith("@@") ? theme.colors.primary :
+                  theme.colors.muted
+                }>{line}</Text>
+              ))}
+              {approval.diff.split("\n").length > 40 ? (
+                <Text color={theme.colors.muted}>... ({approval.diff.split("\n").length - 40} more lines)</Text>
+              ) : null}
+            </Box>
+          ) : null}
           {approval.tool === "run_command" && approval.args.command ? (
             <Text color={theme.colors.muted}>{"  $ "}{String(approval.args.command)}</Text>
           ) : null}
@@ -855,6 +1008,45 @@ function App() {
         </Box>
       )}
 
+      {/* ═══ LOGIN PICKER ═══ */}
+      {loginPicker && (
+        <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>
+          <Text bold color={theme.colors.secondary}>💪 Choose a provider:</Text>
+          {PROVIDERS.filter((p) => p.id !== "local").map((p, i) => (
+            <Text key={p.id}>
+              {i === loginPickerIndex ? <Text color={theme.colors.suggestion} bold>{"▸ "}</Text> : <Text>{"  "}</Text>}
+              <Text color={i === loginPickerIndex ? theme.colors.suggestion : theme.colors.primary} bold>{p.name}</Text>
+              <Text color={theme.colors.muted}>{" — "}{p.description}</Text>
+              {getCredentials().some((c) => c.provider === p.id) ? <Text color={theme.colors.success}> ✓</Text> : null}
+            </Text>
+          ))}
+          <Text dimColor>{"  ↑↓ navigate · Enter select · Esc cancel"}</Text>
+        </Box>
+      )}
+
+      {/* ═══ LOGIN METHOD PICKER ═══ */}
+      {loginMethodPicker && (
+        <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>
+          <Text bold color={theme.colors.secondary}>How do you want to authenticate?</Text>
+          {loginMethodPicker.methods.map((method, i) => {
+            const labels: Record<string, string> = {
+              "oauth": "🌐 Browser login (OAuth)",
+              "setup-token": "🔑 Link subscription (via Claude Code CLI)",
+              "cached-token": "📦 Import from existing CLI",
+              "api-key": "🔒 Enter API key manually",
+              "device-flow": "📱 Device flow (GitHub)",
+            };
+            return (
+              <Text key={method}>
+                {i === loginMethodIndex ? <Text color={theme.colors.suggestion} bold>{"▸ "}</Text> : <Text>{"  "}</Text>}
+                <Text color={i === loginMethodIndex ? theme.colors.suggestion : theme.colors.primary} bold>{labels[method] ?? method}</Text>
+              </Text>
+            );
+          })}
+          <Text dimColor>{"  ↑↓ navigate · Enter select · Esc back"}</Text>
+        </Box>
+      )}
+
       {/* ═══ THEME PICKER ═══ */}
       {themePicker && (
         <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.border} paddingX={1} marginBottom={0}>
@@ -885,6 +1077,32 @@ function App() {
         </Box>
       )}
 
+      {/* ═══ DELETE SESSION PICKER ═══ */}
+      {deleteSessionPicker && (
+        <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.error} paddingX={1} marginBottom={0}>
+          <Text bold color={theme.colors.error}>Delete a session:</Text>
+          {deleteSessionPicker.map((s, i) => (
+            <Text key={s.id}>
+              {i === deleteSessionPickerIndex ? <Text color={theme.colors.suggestion} bold>{"▸ "}</Text> : <Text>{"  "}</Text>}
+              <Text color={i === deleteSessionPickerIndex ? theme.colors.suggestion : theme.colors.muted}>{s.display}</Text>
+            </Text>
+          ))}
+          <Text dimColor>{"  ↑↓ navigate · Enter select · Esc cancel"}</Text>
+        </Box>
+      )}
+
+      {/* ═══ DELETE SESSION CONFIRM ═══ */}
+      {deleteSessionConfirm && (
+        <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.warning} paddingX={1} marginBottom={0}>
+          <Text bold color={theme.colors.warning}>Delete session {deleteSessionConfirm.id}?</Text>
+          <Text color={theme.colors.muted}>{"  "}{deleteSessionConfirm.display}</Text>
+          <Text>
+            <Text color={theme.colors.error} bold> [y]</Text><Text>es  </Text>
+            <Text color={theme.colors.success} bold>[n]</Text><Text>o</Text>
+          </Text>
+        </Box>
+      )}
+
       {/* ═══ COMMAND SUGGESTIONS ═══ */}
       {showSuggestions && (
         <Box flexDirection="column" borderStyle="single" borderColor={theme.colors.muted} paddingX={1} marginBottom={0}>
@@ -931,6 +1149,13 @@ function App() {
               return tokens >= 1000 ? `${(tokens / 1000).toFixed(1)}k` : String(tokens);
             })()}
             {" tokens"}
+            {(() => {
+              const { totalCost } = agent.getCostInfo();
+              if (totalCost > 0) {
+                return ` · 💰 $${totalCost < 0.01 ? totalCost.toFixed(4) : totalCost.toFixed(2)}`;
+              }
+              return "";
+            })()}
             {modelName ? ` · 🤖 ${modelName}` : ""}
           </Text>
         </Box>

package/src/tools/files.ts

@@ -177,6 +177,133 @@ export async function executeTool(
   }
 }
 
+/**
+ * Generate a simple unified diff between two strings
+ */
+export function generateDiff(oldContent: string, newContent: string, filePath: string): string {
+  const oldLines = oldContent.split("\n");
+  const newLines = newContent.split("\n");
+  const output: string[] = [`--- a/${filePath}`, `+++ b/${filePath}`];
+
+  const lcs = computeLCS(oldLines, newLines);
+
+  let oi = 0, ni = 0, li = 0;
+  let hunkLines: string[] = [];
+  let hunkOldCount = 0;
+  let hunkNewCount = 0;
+  let hunkStartOld = 1;
+  let hunkStartNew = 1;
+  let pendingContext: string[] = [];
+  let hasHunk = false;
+
+  function flushHunk() {
+    if (hasHunk && hunkLines.length > 0) {
+      output.push(`@@ -${hunkStartOld},${hunkOldCount} +${hunkStartNew},${hunkNewCount} @@`);
+      output.push(...hunkLines);
+    }
+    hunkLines = [];
+    hunkOldCount = 0;
+    hunkNewCount = 0;
+    hasHunk = false;
+    pendingContext = [];
+  }
+
+  function startHunk() {
+    if (!hasHunk) {
+      hasHunk = true;
+      hunkStartOld = Math.max(1, oi + 1 - 3);
+      hunkStartNew = Math.max(1, ni + 1 - 3);
+      const contextStart = Math.max(0, oi - 3);
+      for (let c = contextStart; c < oi; c++) {
+        hunkLines.push(` ${oldLines[c]}`);
+        hunkOldCount++;
+        hunkNewCount++;
+      }
+    }
+    if (pendingContext.length > 0) {
+      hunkLines.push(...pendingContext);
+      pendingContext = [];
+    }
+  }
+
+  while (oi < oldLines.length || ni < newLines.length) {
+    if (li < lcs.length && oi < oldLines.length && ni < newLines.length &&
+        oldLines[oi] === lcs[li] && newLines[ni] === lcs[li]) {
+      // Matching line
+      if (hasHunk) {
+        pendingContext.push(` ${oldLines[oi]}`);
+        hunkOldCount++;
+        hunkNewCount++;
+        if (pendingContext.length > 6) flushHunk();
+      }
+      oi++; ni++; li++;
+    } else if (oi < oldLines.length && (li >= lcs.length || oldLines[oi] !== lcs[li])) {
+      startHunk();
+      hunkLines.push(`-${oldLines[oi]}`);
+      hunkOldCount++;
+      oi++;
+    } else if (ni < newLines.length && (li >= lcs.length || newLines[ni] !== lcs[li])) {
+      startHunk();
+      hunkLines.push(`+${newLines[ni]}`);
+      hunkNewCount++;
+      ni++;
+    } else {
+      break;
+    }
+  }
+
+  flushHunk();
+
+  if (output.length <= 2) return "(no changes)";
+
+  const maxDiffLines = 60;
+  if (output.length > maxDiffLines + 2) {
+    return output.slice(0, maxDiffLines + 2).join("\n") + `\n... (${output.length - maxDiffLines - 2} more lines)`;
+  }
+  return output.join("\n");
+}
+
+function computeLCS(a: string[], b: string[]): string[] {
+  if (a.length > 500 || b.length > 500) {
+    // For large files, just return common lines in order
+    const result: string[] = [];
+    let bi = 0;
+    for (const line of a) {
+      while (bi < b.length && b[bi] !== line) bi++;
+      if (bi < b.length) { result.push(line); bi++; }
+    }
+    return result;
+  }
+  const m = a.length, n = b.length;
+  const dp: number[][] = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      dp[i][j] = a[i - 1] === b[j - 1] ? dp[i - 1][j - 1] + 1 : Math.max(dp[i - 1][j], dp[i][j - 1]);
+    }
+  }
+  const result: string[] = [];
+  let i = m, j = n;
+  while (i > 0 && j > 0) {
+    if (a[i - 1] === b[j - 1]) { result.unshift(a[i - 1]); i--; j--; }
+    else if (dp[i - 1][j] > dp[i][j - 1]) { i--; }
+    else { j--; }
+  }
+  return result;
+}
+
+/**
+ * Get existing file content for diff preview (returns null if file doesn't exist)
+ */
+export function getExistingContent(filePath: string, cwd: string): string | null {
+  const fullPath = join(cwd, filePath);
+  if (!existsSync(fullPath)) return null;
+  try {
+    return readFileSync(fullPath, "utf-8");
+  } catch {
+    return null;
+  }
+}
+
 function listDir(
   dirPath: string,
   cwd: string,

package/src/utils/sessions.ts

@@ -34,7 +34,10 @@ function getDb(): Database.Database {
       updated_at TEXT NOT NULL DEFAULT (datetime('now')),
       message_count INTEGER NOT NULL DEFAULT 0,
       token_estimate INTEGER NOT NULL DEFAULT 0,
-      summary TEXT
+      summary TEXT,
+      prompt_tokens INTEGER NOT NULL DEFAULT 0,
+      completion_tokens INTEGER NOT NULL DEFAULT 0,
+      estimated_cost REAL NOT NULL DEFAULT 0
     );
 
     CREATE TABLE IF NOT EXISTS messages (
@@ -51,6 +54,17 @@ function getDb(): Database.Database {
     CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id);
   `);
 
+  // Migrate: add cost columns if missing (for existing DBs)
+  try {
+    db.exec(`ALTER TABLE sessions ADD COLUMN prompt_tokens INTEGER NOT NULL DEFAULT 0`);
+  } catch { /* column already exists */ }
+  try {
+    db.exec(`ALTER TABLE sessions ADD COLUMN completion_tokens INTEGER NOT NULL DEFAULT 0`);
+  } catch { /* column already exists */ }
+  try {
+    db.exec(`ALTER TABLE sessions ADD COLUMN estimated_cost REAL NOT NULL DEFAULT 0`);
+  } catch { /* column already exists */ }
+
   return db;
 }
 
@@ -129,6 +143,9 @@ export interface SessionInfo {
   message_count: number;
   token_estimate: number;
   summary: string | null;
+  prompt_tokens: number;
+  completion_tokens: number;
+  estimated_cost: number;
 }
 
 export function listSessions(limit: number = 10): SessionInfo[] {
@@ -191,6 +208,21 @@ export function deleteSession(sessionId: string): boolean {
   return result.changes > 0;
 }
 
+/**
+ * Update cost tracking for a session
+ */
+export function updateSessionCost(
+  sessionId: string,
+  promptTokens: number,
+  completionTokens: number,
+  estimatedCost: number
+): void {
+  const db = getDb();
+  db.prepare(`
+    UPDATE sessions SET prompt_tokens = ?, completion_tokens = ?, estimated_cost = ? WHERE id = ?
+  `).run(promptTokens, completionTokens, estimatedCost, sessionId);
+}
+
 /**
  * Update session summary (for context compression)
  */