darkfoo-code 0.2.4 → 0.3.0

package/dist/main.js

@@ -151,6 +151,13 @@ var init_ollama = __esm({
                   yield { type: "tool_call", toolCall: normalizeToolCall(tc) };
                 }
               }
+              if (chunk.done && (chunk.eval_count || chunk.prompt_eval_count)) {
+                yield {
+                  type: "usage",
+                  inputTokens: chunk.prompt_eval_count ?? 0,
+                  outputTokens: chunk.eval_count ?? 0
+                };
+              }
             }
           }
         } finally {
@@ -299,6 +306,13 @@ var init_openai_compat = __esm({
                   }
                 }
                 pendingToolCalls.clear();
+                if (chunk.usage) {
+                  yield {
+                    type: "usage",
+                    inputTokens: chunk.usage.prompt_tokens ?? 0,
+                    outputTokens: chunk.usage.completion_tokens ?? 0
+                  };
+                }
               }
             }
           }
@@ -549,6 +563,88 @@ var init_permissions = __esm({
   }
 });
 
+// src/hooks.ts
+import { execFile as execFile4 } from "child_process";
+import { readFile as readFile5 } from "fs/promises";
+import { join as join6 } from "path";
+async function loadHooks() {
+  if (cachedHooks) return cachedHooks;
+  try {
+    const raw = await readFile5(SETTINGS_PATH4, "utf-8");
+    const config = JSON.parse(raw);
+    cachedHooks = config.hooks ?? [];
+    return cachedHooks;
+  } catch {
+    cachedHooks = [];
+    return [];
+  }
+}
+async function executeHooks(event, context) {
+  const hooks = await loadHooks();
+  const matching = hooks.filter((h) => {
+    if (h.event !== event) return false;
+    if (h.toolFilter && context.toolName && !h.toolFilter.includes(context.toolName)) return false;
+    return true;
+  });
+  const results = [];
+  for (const hook of matching) {
+    try {
+      const output = await new Promise((resolve8, reject) => {
+        execFile4("bash", ["-c", hook.command], {
+          cwd: context.cwd,
+          timeout: 1e4,
+          env: {
+            ...process.env,
+            DARKFOO_EVENT: event,
+            DARKFOO_TOOL: context.toolName ?? ""
+          }
+        }, (err, stdout) => {
+          if (err) reject(err);
+          else resolve8(stdout.trim());
+        });
+      });
+      if (output) results.push(output);
+    } catch {
+    }
+  }
+  return results;
+}
+var SETTINGS_PATH4, cachedHooks;
+var init_hooks = __esm({
+  "src/hooks.ts"() {
+    "use strict";
+    SETTINGS_PATH4 = join6(process.env.HOME || "~", ".darkfoo", "settings.json");
+    cachedHooks = null;
+  }
+});
+
+// src/utils/debug.ts
+var debug_exports = {};
+__export(debug_exports, {
+  debug: () => debug,
+  isDebugMode: () => isDebugMode,
+  setDebugMode: () => setDebugMode
+});
+function setDebugMode(on) {
+  debugMode = on;
+}
+function isDebugMode() {
+  return debugMode;
+}
+function debug(msg) {
+  if (debugMode) {
+    process.stderr.write(`[debug] ${msg}
+`);
+  }
+}
+var debugMode;
+var init_debug = __esm({
+  "src/utils/debug.ts"() {
+    "use strict";
+    debugMode = false;
+  }
+});
+
 // src/query.ts
 var query_exports = {};
 __export(query_exports, {
@@ -563,6 +659,7 @@ async function* query(params) {
   const ollamaTools = tools.map((t) => t.toOllamaToolDef());
   while (turns < maxTurns) {
     turns++;
+    debug(`query turn ${turns}/${maxTurns}, ${messages.length} messages`);
     const ollamaMessages = toOllamaMessages(messages, systemPrompt);
     let assistantContent = "";
     const toolCalls = [];
@@ -588,7 +685,11 @@ async function* query(params) {
     };
     messages.push(assistantMsg);
     yield { type: "assistant_message", message: assistantMsg };
-    if (toolCalls.length === 0) return;
+    if (toolCalls.length === 0) {
+      debug("no tool calls, query complete");
+      return;
+    }
+    debug(`${toolCalls.length} tool calls: ${toolCalls.map((tc) => tc.function.name).join(", ")}`);
     const readOnlyCalls = [];
     const writeCalls = [];
     const unknownCalls = [];
@@ -611,10 +712,14 @@ async function* query(params) {
       const results = await Promise.all(
         readOnlyCalls.map(async ({ tc, tool }) => {
           const coercedArgs = coerceToolArgs(tc.function.arguments, tool);
+          await executeHooks("pre_tool", { toolName: tool.name, cwd: process.cwd() });
           try {
-            return { tool, result: await tool.call(coercedArgs, { cwd: process.cwd(), abortSignal: signal }) };
+            const result = await tool.call(coercedArgs, { cwd: process.cwd(), abortSignal: signal });
+            await executeHooks("post_tool", { toolName: tool.name, cwd: process.cwd() });
+            return { tool, result };
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
+            await executeHooks("post_tool", { toolName: tool.name, cwd: process.cwd() });
             return { tool, result: { output: `Tool execution error: ${msg}`, isError: true } };
           }
         })
@@ -625,6 +730,12 @@ async function* query(params) {
       }
     }
     for (const { tc, tool } of writeCalls) {
+      if (getAppState().planMode) {
+        const blocked = `Tool "${tool.name}" is blocked in plan mode. Use ExitPlanMode first.`;
+        yield { type: "tool_result", toolName: tool.name, output: blocked, isError: true };
+        messages.push({ id: nanoid3(), role: "tool", content: blocked, toolName: tool.name, timestamp: Date.now() });
+        continue;
+      }
       const coercedArgs = coerceToolArgs(tc.function.arguments, tool);
       const permission = await checkPermission(tool, coercedArgs);
       if (permission === "deny") {
@@ -633,6 +744,7 @@ async function* query(params) {
         messages.push({ id: nanoid3(), role: "tool", content: denied, toolName: tool.name, timestamp: Date.now() });
         continue;
       }
+      await executeHooks("pre_tool", { toolName: tool.name, cwd: process.cwd() });
       let result;
       try {
         result = await tool.call(coercedArgs, { cwd: process.cwd(), abortSignal: signal });
@@ -640,6 +752,7 @@ async function* query(params) {
         const msg = err instanceof Error ? err.message : String(err);
         result = { output: `Tool execution error: ${msg}`, isError: true };
       }
+      await executeHooks("post_tool", { toolName: tool.name, cwd: process.cwd() });
       yield { type: "tool_result", toolName: tool.name, output: result.output, isError: result.isError ?? false };
       messages.push({ id: nanoid3(), role: "tool", content: result.output, toolName: tool.name, timestamp: Date.now() });
     }
@@ -691,12 +804,15 @@ var init_query = __esm({
     "use strict";
     init_providers();
     init_permissions();
+    init_hooks();
+    init_state();
+    init_debug();
   }
 });
 
 // src/context-loader.ts
-import { readFile as readFile5, readdir as readdir2, access } from "fs/promises";
-import { join as join6, dirname, resolve } from "path";
+import { readFile as readFile6, readdir as readdir2, access } from "fs/promises";
+import { join as join7, dirname, resolve } from "path";
 async function loadProjectContext(cwd) {
   const parts = [];
   const globalContent = await tryRead(HOME_CONTEXT);
@@ -704,13 +820,27 @@ async function loadProjectContext(cwd) {
     parts.push(`# Global instructions (~/.darkfoo/DARKFOO.md)
 
 ${globalContent}`);
+  }
+  const userRulesDir = join7(process.env.HOME || "~", ".darkfoo", "rules");
+  try {
+    await access(userRulesDir);
+    const userRuleFiles = await readdir2(userRulesDir);
+    for (const file of userRuleFiles.filter((f) => f.endsWith(".md")).sort()) {
+      const content = await tryRead(join7(userRulesDir, file));
+      if (content) {
+        parts.push(`# User rule: ${file}
+
+${content}`);
+      }
+    }
+  } catch {
   }
   const visited = /* @__PURE__ */ new Set();
   let dir = resolve(cwd);
   while (dir && !visited.has(dir)) {
     visited.add(dir);
     for (const file of CONTEXT_FILES) {
-      const filePath = join6(dir, file);
+      const filePath = join7(dir, file);
       const content = await tryRead(filePath);
       if (content) {
         const rel = filePath.replace(cwd + "/", "");
@@ -723,12 +853,12 @@ ${content}`);
     if (parent === dir) break;
     dir = parent;
   }
-  const rulesDir = join6(cwd, RULES_DIR);
+  const rulesDir = join7(cwd, RULES_DIR);
   try {
     await access(rulesDir);
     const files = await readdir2(rulesDir);
     for (const file of files.filter((f) => f.endsWith(".md")).sort()) {
-      const content = await tryRead(join6(rulesDir, file));
+      const content = await tryRead(join7(rulesDir, file));
       if (content) {
         parts.push(`# Rule: ${file}
 
@@ -741,7 +871,7 @@ ${content}`);
 }
 async function tryRead(path) {
   try {
-    return await readFile5(path, "utf-8");
+    return await readFile6(path, "utf-8");
   } catch {
     return null;
   }
@@ -752,7 +882,7 @@ var init_context_loader = __esm({
     "use strict";
     CONTEXT_FILES = ["DARKFOO.md", ".darkfoo/DARKFOO.md"];
     RULES_DIR = ".darkfoo/rules";
-    HOME_CONTEXT = join6(process.env.HOME || "~", ".darkfoo", "DARKFOO.md");
+    HOME_CONTEXT = join7(process.env.HOME || "~", ".darkfoo", "DARKFOO.md");
   }
 });
 
@@ -847,14 +977,14 @@ var init_types = __esm({
 
 // src/tools/bash.ts
 import { spawn } from "child_process";
-import { writeFile as writeFile6, mkdir as mkdir6, readFile as readFile6 } from "fs/promises";
-import { join as join7 } from "path";
+import { writeFile as writeFile6, mkdir as mkdir6, readFile as readFile7 } from "fs/promises";
+import { join as join8 } from "path";
 import { nanoid as nanoid4 } from "nanoid";
 import { z } from "zod";
 async function runInBackground(command, cwd) {
   const taskId = nanoid4(8);
   await mkdir6(BG_OUTPUT_DIR, { recursive: true });
-  const outputPath = join7(BG_OUTPUT_DIR, `${taskId}.output`);
+  const outputPath = join8(BG_OUTPUT_DIR, `${taskId}.output`);
   backgroundTasks.set(taskId, { command, status: "running", outputPath });
   const proc = spawn(command, {
     shell: true,
@@ -906,7 +1036,7 @@ var init_bash = __esm({
       run_in_background: z.boolean().optional().describe("Run in background, returning a task ID for later retrieval")
     });
     MAX_OUTPUT = 1e5;
-    BG_OUTPUT_DIR = join7(process.env.HOME || "~", ".darkfoo", "bg-tasks");
+    BG_OUTPUT_DIR = join8(process.env.HOME || "~", ".darkfoo", "bg-tasks");
     backgroundTasks = /* @__PURE__ */ new Map();
     BashTool = {
       name: "Bash",
@@ -967,17 +1097,17 @@ var init_bash = __esm({
 });
 
 // src/tools/read.ts
-import { readFile as readFile7, stat } from "fs/promises";
+import { readFile as readFile8, stat } from "fs/promises";
 import { extname, resolve as resolve2 } from "path";
 import { z as z2 } from "zod";
 async function readImage(filePath, size) {
   const ext = extname(filePath).toLowerCase();
   if (ext === ".svg") {
-    const content = await readFile7(filePath, "utf-8");
+    const content = await readFile8(filePath, "utf-8");
     return { output: `SVG image (${size} bytes):
 ${content.slice(0, 5e3)}` };
   }
-  const buffer = await readFile7(filePath);
+  const buffer = await readFile8(filePath);
   const base64 = buffer.toString("base64");
   const sizeKB = (size / 1024).toFixed(1);
   const dims = detectImageDimensions(buffer, ext);
@@ -990,9 +1120,9 @@ Base64 length: ${base64.length} chars
   };
 }
 async function readPdf(filePath) {
-  const { execFile: execFile6 } = await import("child_process");
+  const { execFile: execFile7 } = await import("child_process");
   return new Promise((resolve8) => {
-    execFile6("pdftotext", [filePath, "-"], { timeout: 15e3, maxBuffer: 5 * 1024 * 1024 }, (err, stdout) => {
+    execFile7("pdftotext", [filePath, "-"], { timeout: 15e3, maxBuffer: 5 * 1024 * 1024 }, (err, stdout) => {
       if (err) {
         resolve8({
           output: `PDF file: ${filePath}
@@ -1069,7 +1199,7 @@ var init_read = __esm({
           if (ext === PDF_EXT) {
             return readPdf(filePath);
           }
-          const raw = await readFile7(filePath, "utf-8");
+          const raw = await readFile8(filePath, "utf-8");
           markFileRead(filePath, raw);
           const lines = raw.split("\n");
           const offset = parsed.offset ?? 0;
@@ -1140,7 +1270,7 @@ var init_write = __esm({
 });
 
 // src/tools/edit.ts
-import { readFile as readFile8, writeFile as writeFile8 } from "fs/promises";
+import { readFile as readFile9, writeFile as writeFile8 } from "fs/promises";
 import { resolve as resolve4 } from "path";
 import { createPatch } from "diff";
 import { z as z4 } from "zod";
@@ -1186,7 +1316,7 @@ var init_edit = __esm({
               isError: true
             };
           }
-          const content = await readFile8(filePath, "utf-8");
+          const content = await readFile9(filePath, "utf-8");
           const actualOld = findActualString(content, parsed.old_string);
           if (!actualOld) {
             return {
@@ -1218,7 +1348,7 @@ var init_edit = __esm({
 });
 
 // src/tools/grep.ts
-import { execFile as execFile4 } from "child_process";
+import { execFile as execFile5 } from "child_process";
 import { resolve as resolve5 } from "path";
 import { z as z5 } from "zod";
 var INPUT_SCHEMA5, DEFAULT_HEAD_LIMIT, GrepTool;
@@ -1278,7 +1408,7 @@ var init_grep = __esm({
         }
         args.push(searchPath);
         return new Promise((resolve8) => {
-          execFile4("rg", args, { maxBuffer: 10 * 1024 * 1024, timeout: 3e4 }, (err, stdout, stderr) => {
+          execFile5("rg", args, { maxBuffer: 10 * 1024 * 1024, timeout: 3e4 }, (err, stdout, stderr) => {
             if (err && !stdout) {
               if (err.code === 1 || err.code === "1") {
                 resolve8({ output: "No matches found." });
@@ -1314,7 +1444,7 @@ ${output}`;
 });
 
 // src/tools/glob.ts
-import { execFile as execFile5 } from "child_process";
+import { execFile as execFile6 } from "child_process";
 import { resolve as resolve6 } from "path";
 import { z as z6 } from "zod";
 var INPUT_SCHEMA6, MAX_RESULTS, GlobTool;
@@ -1348,7 +1478,7 @@ var init_glob = __esm({
           searchPath
         ];
         return new Promise((resolve8) => {
-          execFile5("rg", args, { maxBuffer: 10 * 1024 * 1024, timeout: 3e4 }, (err, stdout, stderr) => {
+          execFile6("rg", args, { maxBuffer: 10 * 1024 * 1024, timeout: 3e4 }, (err, stdout, stderr) => {
             if (err && !stdout) {
               if (err.code === 1 || err.code === "1") {
                 resolve8({ output: "No files matched." });
@@ -1599,7 +1729,7 @@ var init_agent = __esm({
 });
 
 // src/tools/notebook-edit.ts
-import { readFile as readFile9, writeFile as writeFile9 } from "fs/promises";
+import { readFile as readFile10, writeFile as writeFile9 } from "fs/promises";
 import { resolve as resolve7 } from "path";
 import { z as z10 } from "zod";
 var INPUT_SCHEMA10, NotebookEditTool;
@@ -1622,7 +1752,7 @@ var init_notebook_edit = __esm({
         const parsed = INPUT_SCHEMA10.parse(input);
         const filePath = resolve7(context.cwd, parsed.file_path);
         try {
-          const raw = await readFile9(filePath, "utf-8");
+          const raw = await readFile10(filePath, "utf-8");
           const notebook = JSON.parse(raw);
           if (parsed.cell_index < 0 || parsed.cell_index >= notebook.cells.length) {
             return {
@@ -1921,14 +2051,13 @@ var DarkfooContext = createContext({ model: "qwen2.5-coder:32b" });
 function useDarkfooContext() {
   return useContext(DarkfooContext);
 }
-function App({ model, systemPromptOverride, children }) {
-  return /* @__PURE__ */ jsx(DarkfooContext.Provider, { value: { model, systemPromptOverride }, children });
+function App({ model, systemPromptOverride, maxTurns, initialMessages, initialSessionId, children }) {
+  return /* @__PURE__ */ jsx(DarkfooContext.Provider, { value: { model, systemPromptOverride, maxTurns, initialMessages, initialSessionId }, children });
 }
 
 // src/repl.tsx
-import { useState as useState3, useCallback as useCallback2, useEffect as useEffect2, useRef as useRef2 } from "react";
+import { useState as useState2, useCallback as useCallback2, useEffect, useRef } from "react";
 import { Box as Box7, Text as Text7, useApp, useInput as useInput2 } from "ink";
-import Spinner2 from "ink-spinner";
 import { nanoid as nanoid6 } from "nanoid";
 
 // src/components/Banner.tsx
@@ -1936,535 +2065,25 @@ init_theme();
 import { memo as memo2 } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 
-// src/components/Fox.tsx
-init_theme();
-import { useState, useEffect, useRef, memo } from "react";
+// src/components/Mascot.tsx
+import { memo } from "react";
 import { Box, Text } from "ink";
-
-// src/fox-state.ts
-var DEFAULT_STATS = {
-  name: "DarkFox",
-  happiness: 70,
-  hunger: 80,
-  energy: 90,
-  timesPetted: 0,
-  timesFed: 0,
-  createdAt: Date.now()
-};
-var stats = { ...DEFAULT_STATS };
-var lastDecayTime = Date.now();
-function getFoxStats() {
-  decay();
-  return { ...stats };
-}
-function setFoxName(name) {
-  stats.name = name;
-}
-function petFox() {
-  decay();
-  stats.happiness = Math.min(100, stats.happiness + 15);
-  stats.timesPetted++;
-  const reactions = [
-    `${stats.name} nuzzles your hand.`,
-    `${stats.name} purrs softly.`,
-    `${stats.name}'s tail wags happily.`,
-    `${stats.name} leans into the pets.`,
-    `${stats.name} rolls over for belly rubs.`,
-    `${stats.name} makes a happy chirping sound.`,
-    `${stats.name} bumps your hand with their nose.`
-  ];
-  if (stats.happiness >= 95) {
-    return `${stats.name} is absolutely overjoyed! Maximum floof achieved.`;
-  }
-  return reactions[stats.timesPetted % reactions.length];
-}
-function feedFox() {
-  decay();
-  stats.hunger = Math.min(100, stats.hunger + 25);
-  stats.happiness = Math.min(100, stats.happiness + 5);
-  stats.timesFed++;
-  const foods = [
-    "a small cookie",
-    "some berries",
-    "a piece of fish",
-    "a tiny sandwich",
-    "some trail mix",
-    "a warm dumpling",
-    "a bit of cheese"
-  ];
-  const food = foods[stats.timesFed % foods.length];
-  if (stats.hunger >= 95) {
-    return `${stats.name} nibbles ${food} contentedly. Completely stuffed!`;
-  }
-  return `${stats.name} happily munches on ${food}.`;
-}
-function restFox() {
-  decay();
-  stats.energy = Math.min(100, stats.energy + 30);
-  stats.happiness = Math.min(100, stats.happiness + 5);
-  return `${stats.name} curls up for a quick nap... Energy restored!`;
-}
-function getFoxComment() {
-  decay();
-  if (stats.hunger < 20) {
-    const hungry = [
-      `${stats.name} looks at you hopefully...`,
-      `${stats.name}'s stomach growls.`,
-      `${stats.name} sniffs around for food.`
-    ];
-    return hungry[Math.floor(Math.random() * hungry.length)];
-  }
-  if (stats.energy < 20) {
-    const tired = [
-      `${stats.name} yawns widely.`,
-      `${stats.name}'s eyelids are drooping.`,
-      `${stats.name} stretches and looks sleepy.`
-    ];
-    return tired[Math.floor(Math.random() * tired.length)];
-  }
-  if (stats.happiness < 30) {
-    return `${stats.name} looks a bit lonely. Try /pet`;
-  }
-  if (Math.random() < 0.15 && stats.happiness > 60) {
-    const happy = [
-      `${stats.name} watches your code intently.`,
-      `${stats.name} tilts their head curiously.`,
-      `${stats.name} flicks an ear.`,
-      null,
-      null,
-      null
-    ];
-    return happy[Math.floor(Math.random() * happy.length)] ?? null;
-  }
-  return null;
-}
-function decay() {
-  const now = Date.now();
-  const elapsed = (now - lastDecayTime) / 6e4;
-  if (elapsed < 1) return;
-  lastDecayTime = now;
-  const minutes = Math.floor(elapsed);
-  stats.hunger = Math.max(0, stats.hunger - minutes * 1.5);
-  stats.energy = Math.max(0, stats.energy - minutes * 0.5);
-  if (stats.hunger < 30) stats.happiness = Math.max(0, stats.happiness - minutes * 1);
-  if (stats.energy < 20) stats.happiness = Math.max(0, stats.happiness - minutes * 0.5);
-}
-
-// src/components/Fox.tsx
 import { jsx as jsx2, jsxs } from "react/jsx-runtime";
-var IDLE = [
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "     ~    "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    ~     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   >   <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "   ~      "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    ~     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "     ~    "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   >   <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "      ~   "
-  ]
-];
-var THINKING = [
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    .     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.- ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    . .   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( -.o ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "   . . .  "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.o ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    . .   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( o.. ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    .     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ..o ) ",
-    "   > ^ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "   . . .  "
-  ]
-];
-var WORKING = [
-  [
-    "   /\\_/\\  ",
-    "  ( >.< ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "   ~\\     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( >.< ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "     /~   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( >.> ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "   ~\\     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( <.< ) ",
-    "   > ^ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "     /~   "
-  ]
-];
-var SUCCESS = [
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/ * "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /| * |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "  * \\~/   "
-  ]
-];
-var ERROR = [
-  [
-    "   /\\_/\\  ",
-    "  ( ;.; ) ",
-    "   > n <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    .     "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ;_; ) ",
-    "   > n <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "          "
-  ]
-];
-var GREETING = [
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ )/",
-    "   > w <  ",
-    "  /|   |  ",
-    " (_|   |) ",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <| ",
-    "  /|   |  ",
-    " (_|   |) ",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ )/",
-    "   > w <  ",
-    "  /|   |  ",
-    " (_|   |) ",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ]
-];
-var PET = [
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /|   |\\ ",
-    " (_| ~ |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( >.< ) ",
-    "   > w <  ",
-    "  /| ~ |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^w^ ) ",
-    "   > ~ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/ * "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > w <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "  * \\~/   "
-  ]
-];
-var EATING = [
-  [
-    "   /\\_/\\  ",
-    "  ( o.o )~",
-    "   > ^ < o",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( >o< ) ",
-    "   > ~ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^.^ ) ",
-    "   > o <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( ^w^ ) ",
-    "   > ~ <  ",
-    "  /|   |\\ ",
-    " (_|   |_)",
-    "    \\~/   "
-  ]
-];
-var SLEEPING = [
-  [
-    "   /\\_/\\  ",
-    "  ( -.- ) ",
-    "   > ~ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "     z    "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( -.- ) ",
-    "   > ~ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    z z   "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( -.- ) ",
-    "   > ~ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "   z z z  "
-  ],
-  [
-    "   /\\_/\\  ",
-    "  ( -.- ) ",
-    "   > ~ <  ",
-    "   |   |  ",
-    "   |___|  ",
-    "    z z   "
-  ]
-];
-var FRAME_SETS = {
-  idle: IDLE,
-  thinking: THINKING,
-  working: WORKING,
-  success: SUCCESS,
-  error: ERROR,
-  greeting: GREETING,
-  pet: PET,
-  eating: EATING,
-  sleeping: SLEEPING
-};
-var FRAME_SPEEDS = {
-  idle: 800,
-  thinking: 600,
-  working: 500,
-  success: 600,
-  error: 1e3,
-  greeting: 600,
-  pet: 500,
-  eating: 600,
-  sleeping: 1200
-};
-var BODY_COLORS = {
+var MOOD_COLORS = {
   idle: "#5eead4",
   thinking: "#a78bfa",
   working: "#fbbf24",
   success: "#4ade80",
-  error: "#f472b6",
-  greeting: "#5eead4",
-  pet: "#f472b6",
-  eating: "#fbbf24",
-  sleeping: "#7e8ea6"
-};
-var FACE_COLORS = {
-  idle: "#e2e8f0",
-  thinking: "#5eead4",
-  working: "#5eead4",
-  success: "#4ade80",
-  error: "#f472b6",
-  greeting: "#4ade80",
-  pet: "#f472b6",
-  eating: "#fbbf24",
-  sleeping: "#7e8ea6"
+  error: "#f472b6"
 };
-var Fox = memo(function Fox2({ mood = "idle" }) {
-  const [frameIdx, setFrameIdx] = useState(0);
-  const [bubble, setBubble] = useState(null);
-  const frames = FRAME_SETS[mood];
-  const speed = FRAME_SPEEDS[mood];
-  const bubbleTimer = useRef(null);
-  useEffect(() => {
-    setFrameIdx(0);
-    const interval = setInterval(() => {
-      setFrameIdx((prev) => (prev + 1) % frames.length);
-    }, speed);
-    return () => clearInterval(interval);
-  }, [mood, frames.length, speed]);
-  useEffect(() => {
-    if (mood !== "idle") {
-      setBubble(null);
-      return;
-    }
-    const check = () => {
-      const comment = getFoxComment();
-      if (comment) {
-        setBubble(comment);
-        if (bubbleTimer.current) clearTimeout(bubbleTimer.current);
-        bubbleTimer.current = setTimeout(() => setBubble(null), 6e3);
-      }
-    };
-    const interval = setInterval(check, 15e3);
-    return () => {
-      clearInterval(interval);
-      if (bubbleTimer.current) clearTimeout(bubbleTimer.current);
-    };
-  }, [mood]);
-  const frame = frames[frameIdx] ?? frames[0];
-  const bodyColor = BODY_COLORS[mood];
-  const faceColor = FACE_COLORS[mood];
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    bubble ? /* @__PURE__ */ jsx2(FoxBubble, { text: bubble }) : null,
-    frame.map((line, i) => /* @__PURE__ */ jsx2(Text, { color: i <= 1 ? faceColor : bodyColor, children: line }, i))
+var Mascot = memo(function Mascot2({ mood = "idle" }) {
+  const color = MOOD_COLORS[mood];
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", alignItems: "center", children: [
+    /* @__PURE__ */ jsx2(Text, { color, children: "    \u259F\u2588\u2588\u2599" }),
+    /* @__PURE__ */ jsx2(Text, { color, children: "   \u2590\u2588\u2588\u2588\u2588\u258C" }),
+    /* @__PURE__ */ jsx2(Text, { color, children: "    \u259C\u2588\u2588\u259B" })
   ] });
 });
-function FoxBubble({ text }) {
-  if (!text) return null;
-  const maxW = 28;
-  const display = text.length > maxW ? text.slice(0, maxW - 2) + ".." : text;
-  const w = display.length;
-  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx2(Text, { color: theme.dim ?? "#7e8ea6", children: "." + "-".repeat(w + 2) + "." }),
-    /* @__PURE__ */ jsxs(Text, { color: theme.dim ?? "#7e8ea6", children: [
-      "| ",
-      /* @__PURE__ */ jsx2(Text, { color: theme.text ?? "#e2e8f0", children: display }),
-      " |"
-    ] }),
-    /* @__PURE__ */ jsx2(Text, { color: theme.dim ?? "#7e8ea6", children: "'" + "-".repeat(w + 2) + "'" })
-  ] });
-}
 
 // src/components/Banner.tsx
 import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
@@ -2496,26 +2115,20 @@ function gradientBar(width) {
     color: GRADIENT[Math.round(i / (width - 1) * (GRADIENT.length - 1))]
   }));
 }
-var Banner = memo2(function Banner2({ model, cwd, providerName, providerOnline }) {
+var Banner = memo2(function Banner2({ model, cwd, providerName, providerOnline, mood }) {
   const bar = gradientBar(60);
   const statusTag = providerOnline ? "[connected]" : "[offline]";
   const statusColor = providerOnline ? theme.green ?? "#4ade80" : theme.pink ?? "#f472b6";
   return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsxs2(Box2, { children: [
-      /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-        LOGO_LINES.map((line, i) => /* @__PURE__ */ jsx3(Text2, { color: lineColor(i), bold: true, children: line }, i)),
-        /* @__PURE__ */ jsx3(Text2, { color: theme.purple ?? "#a78bfa", bold: true, children: SUBTITLE })
-      ] }),
-      /* @__PURE__ */ jsxs2(Box2, { marginLeft: 2, flexDirection: "row", alignItems: "flex-end", children: [
-        /* @__PURE__ */ jsx3(Fox, { mood: "greeting" }),
-        /* @__PURE__ */ jsx3(FoxBubble, { text: "Ready to work." })
-      ] })
+    /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", alignItems: "center", children: [
+      LOGO_LINES.map((line, i) => /* @__PURE__ */ jsx3(Text2, { color: lineColor(i), bold: true, children: line }, i)),
+      /* @__PURE__ */ jsx3(Text2, { color: theme.purple ?? "#a78bfa", bold: true, children: SUBTITLE })
     ] }),
-    /* @__PURE__ */ jsx3(Text2, { children: " " }),
-    /* @__PURE__ */ jsxs2(Text2, { children: [
+    /* @__PURE__ */ jsx3(Box2, { justifyContent: "center", marginTop: 1, children: /* @__PURE__ */ jsx3(Mascot, { mood }) }),
+    /* @__PURE__ */ jsx3(Box2, { marginTop: 1, children: /* @__PURE__ */ jsxs2(Text2, { children: [
       "  ",
       bar.map((d, i) => /* @__PURE__ */ jsx3(Text2, { color: d.color, children: d.char }, i))
-    ] }),
+    ] }) }),
     /* @__PURE__ */ jsxs2(Box2, { marginTop: 1, marginLeft: 2, children: [
       /* @__PURE__ */ jsx3(Text2, { color: theme.dim ?? "#7e8ea6", children: "model  " }),
       model ? /* @__PURE__ */ jsx3(Text2, { color: theme.cyan ?? "#5eead4", bold: true, children: model }) : /* @__PURE__ */ jsx3(Text2, { color: theme.dim ?? "#7e8ea6", children: "--" })
@@ -2643,11 +2256,10 @@ function MessageRow({ message }) {
 init_theme();
 init_format();
 import { Box as Box4, Text as Text4 } from "ink";
-import Spinner from "ink-spinner";
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 function ActiveToolCall({ toolName, args }) {
   return /* @__PURE__ */ jsxs4(Box4, { marginLeft: 2, children: [
-    /* @__PURE__ */ jsx5(Text4, { color: theme.cyan, children: /* @__PURE__ */ jsx5(Spinner, { type: "dots" }) }),
+    /* @__PURE__ */ jsx5(Text4, { color: theme.cyan, children: "..." }),
     /* @__PURE__ */ jsxs4(Text4, { bold: true, color: theme.yellow, children: [
       " ",
       toolName
@@ -2755,7 +2367,7 @@ var StatusLine = memo4(function StatusLine2({ model, messageCount, tokenEstimate
 
 // src/components/UserInput.tsx
 init_theme();
-import { useState as useState2, useCallback, memo as memo5 } from "react";
+import { useState, useCallback, memo as memo5 } from "react";
 import { Box as Box6, Text as Text6, useInput } from "ink";
 import TextInput from "ink-text-input";
 
@@ -2844,12 +2456,15 @@ import { nanoid } from "nanoid";
 var compactCommand = {
   name: "compact",
   description: "Compress conversation history to save context",
-  async execute(_args, context) {
+  async execute(args, context) {
     if (context.messages.length < 4) {
       return { output: "Conversation is too short to compact.", silent: true };
     }
     const transcript = context.messages.filter((m) => m.role === "user" || m.role === "assistant" && m.content).map((m) => `${m.role}: ${m.content}`).join("\n\n");
-    const summaryPrompt = `Summarize this conversation concisely. Capture all key decisions, code changes, file paths mentioned, and current task state. Be thorough but brief:
+    const focus = args.trim();
+    const summaryPrompt = focus ? `Summarize this conversation, focusing especially on: ${focus}. Capture key decisions, code changes, file paths, and current state:
+
+${transcript}` : `Summarize this conversation concisely. Capture all key decisions, code changes, file paths mentioned, and current task state. Be thorough but brief:
 
 ${transcript}`;
     try {
@@ -2923,7 +2538,7 @@ var contextCommand = {
       }
       totalTokens += tokens;
     }
-    const sysTokens = 2e3;
+    const sysTokens = context.systemPrompt ? estimateTokens(context.systemPrompt) : 2e3;
     totalTokens += sysTokens;
     const usage = totalTokens / contextLimit;
     const barWidth = 40;
@@ -2937,7 +2552,7 @@ var contextCommand = {
       `  ~${totalTokens.toLocaleString()} / ${contextLimit.toLocaleString()} tokens`,
       "",
       "  Breakdown:",
-      `    System prompt:  ~${sysTokens.toLocaleString()} tokens`,
+      `    System prompt:  ${context.systemPrompt ? "" : "~"}${sysTokens.toLocaleString()} tokens`,
       ...breakdown.map(
         (b) => `    ${b.role.padEnd(12)} ${b.count} msgs, ~${b.tokens.toLocaleString()} tokens`
       ),
@@ -3027,6 +2642,13 @@ async function saveSession(id, messages, model, cwd) {
   };
   await writeFile2(join2(SESSIONS_DIR, `${id}.json`), JSON.stringify(data, null, 2), "utf-8");
 }
+async function renameSession(id, title) {
+  const session = await loadSession(id);
+  if (!session) return;
+  session.title = title;
+  session.updatedAt = Date.now();
+  await writeFile2(join2(SESSIONS_DIR, `${id}.json`), JSON.stringify(session, null, 2), "utf-8");
+}
 async function loadSession(id) {
   try {
     const raw = await readFile2(join2(SESSIONS_DIR, `${id}.json`), "utf-8");
@@ -3689,68 +3311,36 @@ var providerCommand = {
   }
 };
 
-// src/commands/fox.ts
-var petCommand = {
-  name: "pet",
-  description: "Pet your fox companion",
-  async execute(_args, _context) {
-    const reaction = petFox();
-    return { output: reaction, silent: true, foxMood: "pet" };
-  }
-};
-var feedCommand = {
-  name: "feed",
-  description: "Feed your fox companion",
-  async execute(_args, _context) {
-    const reaction = feedFox();
-    return { output: reaction, silent: true, foxMood: "eating" };
-  }
-};
-var restCommand = {
-  name: "rest",
-  aliases: ["sleep", "nap"],
-  description: "Let your fox take a nap",
-  async execute(_args, _context) {
-    const reaction = restFox();
-    return { output: reaction, silent: true, foxMood: "sleeping" };
+// src/commands/rename.ts
+var renameCommand = {
+  name: "rename",
+  description: "Rename the current session (usage: /rename <title>)",
+  async execute(args, context) {
+    const title = args.trim();
+    if (!title) {
+      return { output: "Usage: /rename <new session title>", silent: true };
+    }
+    await renameSession(context.sessionId, title);
+    return { output: `Session renamed to: ${title}`, silent: true };
   }
 };
-var foxCommand = {
-  name: "fox",
-  aliases: ["companion", "buddy"],
-  description: "Check on your fox companion (usage: /fox, /fox name <name>)",
+
+// src/commands/plan.ts
+init_state();
+var planCommand = {
+  name: "plan",
+  description: "Enter plan mode to explore and design before implementing (usage: /plan <description>)",
   async execute(args, _context) {
-    const parts = args.trim().split(/\s+/);
-    if (parts[0] === "name" && parts[1]) {
-      const newName = parts.slice(1).join(" ");
-      setFoxName(newName);
-      return { output: `Your fox is now named "${newName}".`, silent: true };
+    const description = args.trim();
+    if (!description) {
+      return { output: "Usage: /plan <what you want to plan>", silent: true };
     }
-    const stats2 = getFoxStats();
-    const bar = (val) => {
-      const filled = Math.round(val / 5);
-      const empty = 20 - filled;
-      return "\x1B[36m" + "#".repeat(filled) + "\x1B[0m\x1B[2m" + "-".repeat(empty) + "\x1B[0m";
+    updateAppState((s) => ({ ...s, planMode: true }));
+    return {
+      output: `Enter plan mode. Explore the codebase and design a plan for: ${description}`,
+      silent: false,
+      foxMood: "thinking"
     };
-    const age = Math.floor((Date.now() - stats2.createdAt) / 6e4);
-    const ageStr = age < 60 ? `${age}m` : `${Math.floor(age / 60)}h ${age % 60}m`;
-    const lines = [
-      `\x1B[1m\x1B[36m${stats2.name}\x1B[0m`,
-      "",
-      `  Happiness  [${bar(stats2.happiness)}] ${Math.round(stats2.happiness)}%`,
-      `  Hunger     [${bar(stats2.hunger)}] ${Math.round(stats2.hunger)}%`,
-      `  Energy     [${bar(stats2.energy)}] ${Math.round(stats2.energy)}%`,
-      "",
-      `  Times petted:  ${stats2.timesPetted}`,
-      `  Times fed:     ${stats2.timesFed}`,
-      `  Age:           ${ageStr}`,
-      "",
-      "\x1B[2m  /pet   \u2014 Pet your fox",
-      "  /feed  \u2014 Feed your fox",
-      "  /rest  \u2014 Let your fox nap",
-      "  /fox name <name> \u2014 Rename\x1B[0m"
-    ];
-    return { output: lines.join("\n"), silent: true };
   }
 };
 
@@ -3777,10 +3367,8 @@ var COMMANDS = [
   filesCommand,
   briefCommand,
   providerCommand,
-  petCommand,
-  feedCommand,
-  restCommand,
-  foxCommand
+  renameCommand,
+  planCommand
 ];
 function getCommands() {
   return COMMANDS;
@@ -3818,8 +3406,8 @@ function getCommandNames() {
 // src/components/UserInput.tsx
 import { Fragment as Fragment2, jsx as jsx7, jsxs as jsxs6 } from "react/jsx-runtime";
 var UserInput = memo5(function UserInput2({ value, onChange, onSubmit, disabled, history }) {
-  const [historyIdx, setHistoryIdx] = useState2(-1);
-  const [suggestion, setSuggestion] = useState2("");
+  const [historyIdx, setHistoryIdx] = useState(-1);
+  const [suggestion, setSuggestion] = useState("");
   useInput((_input, key) => {
     if (disabled || !history || history.length === 0) return;
     if (key.upArrow) {
@@ -3906,6 +3494,7 @@ init_system_prompt();
 init_providers();
 init_tools();
 init_bash();
+init_hooks();
 init_theme();
 import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
 function getContextLimit3(model) {
@@ -3919,40 +3508,44 @@ function getContextLimit3(model) {
   return 8192;
 }
 function REPL({ initialPrompt }) {
-  const { model: initialModel, systemPromptOverride } = useDarkfooContext();
+  const { model: initialModel, systemPromptOverride, maxTurns, initialMessages, initialSessionId } = useDarkfooContext();
   const { exit } = useApp();
-  const [model, setModel] = useState3(initialModel);
-  const [messages, setMessages] = useState3([]);
-  const [inputValue, setInputValue] = useState3("");
-  const [isStreaming, setIsStreaming] = useState3(false);
-  const [streamingText, setStreamingText] = useState3("");
-  const [activeTool, setActiveTool] = useState3(null);
-  const [toolResults, setToolResults] = useState3([]);
-  const [commandOutput, setCommandOutput] = useState3(null);
-  const [inputHistory, setInputHistory] = useState3([]);
-  const [tokenCounts, setTokenCounts] = useState3({ input: 0, output: 0 });
-  const [systemPrompt, setSystemPrompt] = useState3("");
-  const [foxMood, setFoxMood] = useState3("idle");
-  const [providerOnline, setProviderOnline] = useState3(true);
-  const abortRef = useRef2(null);
-  const hasRun = useRef2(false);
-  const sessionId = useRef2(createSessionId());
-  const messagesRef = useRef2(messages);
+  const [model, setModel] = useState2(initialModel);
+  const [messages, setMessages] = useState2(initialMessages ?? []);
+  const [inputValue, setInputValue] = useState2("");
+  const [isStreaming, setIsStreaming] = useState2(false);
+  const [streamingText, setStreamingText] = useState2("");
+  const [activeTool, setActiveTool] = useState2(null);
+  const [toolResults, setToolResults] = useState2([]);
+  const [commandOutput, setCommandOutput] = useState2(null);
+  const [inputHistory, setInputHistory] = useState2([]);
+  const [tokenCounts, setTokenCounts] = useState2({ input: 0, output: 0 });
+  const [systemPrompt, setSystemPrompt] = useState2("");
+  const [mascotMood, setMascotMood] = useState2("idle");
+  const [providerOnline, setProviderOnline] = useState2(true);
+  const abortRef = useRef(null);
+  const hasRun = useRef(false);
+  const sessionId = useRef(initialSessionId ?? createSessionId());
+  const messagesRef = useRef(messages);
   messagesRef.current = messages;
-  const modelRef = useRef2(model);
+  const modelRef = useRef(model);
   modelRef.current = model;
-  const systemPromptRef = useRef2(systemPrompt);
+  const systemPromptRef = useRef(systemPrompt);
   systemPromptRef.current = systemPrompt;
   const tools = getTools();
   const cwd = process.cwd();
-  useEffect2(() => {
+  useEffect(() => {
     if (systemPromptOverride) {
       setSystemPrompt(systemPromptOverride);
     } else {
       buildSystemPrompt(tools, cwd).then(setSystemPrompt);
     }
   }, []);
-  useEffect2(() => {
+  useEffect(() => {
+    executeHooks("session_start", { cwd }).catch(() => {
+    });
+  }, []);
+  useEffect(() => {
     const provider = getProvider();
     provider.healthCheck().then((ok) => {
       setProviderOnline(ok);
@@ -3985,16 +3578,18 @@ function REPL({ initialPrompt }) {
     });
   }, []);
   const clearMessages = useCallback2(() => setMessages([]), []);
-  const commandContextRef = useRef2({
+  const commandContextRef = useRef({
     messages,
     model,
     cwd,
+    sessionId: sessionId.current,
     setModel,
     clearMessages,
     exit,
-    tokenCounts
+    tokenCounts,
+    systemPrompt
   });
-  commandContextRef.current = { messages, model, cwd, setModel, clearMessages, exit, tokenCounts };
+  commandContextRef.current = { messages, model, cwd, sessionId: sessionId.current, setModel, clearMessages, exit, tokenCounts, systemPrompt };
   const addToHistory = useCallback2((input) => {
     setInputHistory((prev) => {
       const filtered = prev.filter((h) => h !== input);
@@ -4014,42 +3609,45 @@ function REPL({ initialPrompt }) {
       setStreamingText("");
       setToolResults([]);
       setCommandOutput(null);
-      setFoxMood("thinking");
+      setMascotMood("thinking");
       const controller = new AbortController();
       abortRef.current = controller;
       const allMessages = [...messagesRef.current, userMsg];
       const currentModel = modelRef.current;
       const currentSystemPrompt = systemPromptRef.current;
-      setTokenCounts((prev) => ({
-        ...prev,
-        input: prev.input + Math.ceil(userMessage.length / 4)
-      }));
       try {
         for await (const event of query({
           model: currentModel,
           messages: allMessages,
           tools,
           systemPrompt: currentSystemPrompt,
-          signal: controller.signal
+          signal: controller.signal,
+          maxTurns
         })) {
           if (controller.signal.aborted) break;
           switch (event.type) {
             case "text_delta":
               setStreamingText((prev) => prev + event.text);
-              setFoxMood("idle");
+              setMascotMood("idle");
               break;
             case "tool_call":
               setActiveTool({ name: event.toolCall.function.name, args: event.toolCall.function.arguments });
-              setFoxMood("working");
+              setMascotMood("working");
               break;
             case "tool_result":
               setActiveTool(null);
-              setFoxMood(event.isError ? "error" : "working");
+              setMascotMood(event.isError ? "error" : "working");
               setToolResults((prev) => [
                 ...prev,
                 { id: nanoid6(), toolName: event.toolName, output: event.output, isError: event.isError }
               ]);
               break;
+            case "usage":
+              setTokenCounts((prev) => ({
+                input: prev.input + event.inputTokens,
+                output: prev.output + event.outputTokens
+              }));
+              break;
             case "assistant_message":
               setMessages((prev) => {
                 const updated = [...prev, event.message];
@@ -4057,14 +3655,10 @@ function REPL({ initialPrompt }) {
                 });
                 return updated;
               });
-              setTokenCounts((prev) => ({
-                ...prev,
-                output: prev.output + Math.ceil((event.message.content?.length ?? 0) / 4)
-              }));
               setStreamingText("");
               break;
             case "error":
-              setFoxMood("error");
+              setMascotMood("error");
               setMessages((prev) => [
                 ...prev,
                 { id: nanoid6(), role: "assistant", content: `Error: ${event.error}`, timestamp: Date.now() }
@@ -4085,8 +3679,8 @@ function REPL({ initialPrompt }) {
         setStreamingText("");
         setActiveTool(null);
         setToolResults([]);
-        setFoxMood((prev) => prev === "error" ? "error" : "success");
-        setTimeout(() => setFoxMood("idle"), 2e3);
+        setMascotMood((prev) => prev === "error" ? "error" : "success");
+        setTimeout(() => setMascotMood("idle"), 2e3);
         abortRef.current = null;
       }
     },
@@ -4109,8 +3703,8 @@ function REPL({ initialPrompt }) {
             setMessages(result.replaceMessages);
           }
           if (result.foxMood) {
-            setFoxMood(result.foxMood);
-            setTimeout(() => setFoxMood("idle"), 3e3);
+            setMascotMood(result.foxMood);
+            setTimeout(() => setMascotMood("idle"), 3e3);
           }
           if (result.exit) return;
           if (!result.silent && result.output) {
@@ -4146,14 +3740,14 @@ function REPL({ initialPrompt }) {
     },
     [addToHistory, exit, cwd, runQuery]
   );
-  useEffect2(() => {
+  useEffect(() => {
     if (initialPrompt && !hasRun.current) {
       hasRun.current = true;
       runQuery(initialPrompt);
     }
   }, [initialPrompt, runQuery]);
-  const autoCompactRef = useRef2(false);
-  useEffect2(() => {
+  const autoCompactRef = useRef(false);
+  useEffect(() => {
     if (isStreaming || autoCompactRef.current || messages.length < 6) return;
     const totalChars = messages.reduce((sum, m) => sum + m.content.length, 0);
     const estTokens = Math.ceil(totalChars / 4) + 2e3;
@@ -4197,7 +3791,7 @@ ${result.content}
     }
   });
   return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", padding: 1, children: [
-    /* @__PURE__ */ jsx8(Banner, { model, cwd, providerName: getActiveProviderName(), providerOnline }),
+    /* @__PURE__ */ jsx8(Banner, { model, cwd, providerName: getActiveProviderName(), providerOnline, mood: mascotMood }),
     /* @__PURE__ */ jsx8(Messages, { messages }),
     commandOutput ? /* @__PURE__ */ jsx8(Box7, { marginBottom: 1, marginLeft: 2, flexDirection: "column", children: /* @__PURE__ */ jsx8(Text7, { children: commandOutput }) }) : null,
     toolResults.map((tr) => /* @__PURE__ */ jsx8(ToolResultDisplay, { toolName: tr.toolName, output: tr.output, isError: tr.isError }, tr.id)),
@@ -4205,28 +3799,22 @@ ${result.content}
     isStreaming && streamingText ? /* @__PURE__ */ jsxs7(Box7, { marginBottom: 1, children: [
       /* @__PURE__ */ jsx8(Text7, { color: theme.cyan, children: "\u23BF " }),
       /* @__PURE__ */ jsx8(Text7, { color: theme.text, wrap: "wrap", children: streamingText }),
-      /* @__PURE__ */ jsxs7(Text7, { color: theme.cyan, children: [
-        " ",
-        /* @__PURE__ */ jsx8(Spinner2, { type: "dots" })
-      ] })
+      /* @__PURE__ */ jsx8(Text7, { color: theme.dim, children: " ..." })
     ] }) : null,
     isStreaming && !streamingText && !activeTool ? /* @__PURE__ */ jsxs7(Box7, { marginLeft: 2, children: [
-      /* @__PURE__ */ jsx8(Text7, { color: theme.cyan, children: /* @__PURE__ */ jsx8(Spinner2, { type: "dots" }) }),
-      /* @__PURE__ */ jsx8(Text7, { color: theme.dim, children: " Thinking..." })
+      /* @__PURE__ */ jsx8(Text7, { color: theme.cyan, children: "..." }),
+      /* @__PURE__ */ jsx8(Text7, { color: theme.dim, children: " Thinking" })
     ] }) : null,
-    /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsx8(Box7, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx8(
-        UserInput,
-        {
-          value: inputValue,
-          onChange: setInputValue,
-          onSubmit: handleSubmit,
-          disabled: isStreaming,
-          history: inputHistory
-        }
-      ) }),
-      /* @__PURE__ */ jsx8(Box7, { marginLeft: 1, children: /* @__PURE__ */ jsx8(Fox, { mood: foxMood }) })
-    ] }),
+    /* @__PURE__ */ jsx8(
+      UserInput,
+      {
+        value: inputValue,
+        onChange: setInputValue,
+        onSubmit: handleSubmit,
+        disabled: isStreaming,
+        history: inputHistory
+      }
+    ),
     /* @__PURE__ */ jsx8(
       StatusLine,
       {
@@ -4243,8 +3831,13 @@ ${result.content}
 init_providers();
 import { jsx as jsx9 } from "react/jsx-runtime";
 var program = new Command();
-program.name("darkfoo").description("Darkfoo Code \u2014 local AI coding assistant powered by local LLM providers").version("0.2.1").option("-m, --model <model>", "Model to use", "llama3.1:8b").option("-p, --prompt <prompt>", "Run a single prompt (non-interactive)").option("--provider <name>", "LLM provider backend (ollama, llama-cpp, vllm, tgi, etc.)").option("--system-prompt <prompt>", "Override the system prompt").action(async (options) => {
+program.name("darkfoo").description("Darkfoo Code \u2014 local AI coding assistant powered by local LLM providers").version("0.3.0").option("-m, --model <model>", "Model to use", "llama3.1:8b").option("-p, --prompt <prompt>", "Run a single prompt (non-interactive)").option("-c, --continue", "Resume the most recent session").option("--resume <id>", "Resume a specific session by ID").option("--max-turns <n>", "Maximum tool-use turns per query", "30").option("--debug", "Enable debug logging to stderr").option("--output-format <format>", "Output format for non-interactive mode (text, json)").option("--provider <name>", "LLM provider backend (ollama, llama-cpp, vllm, tgi, etc.)").option("--system-prompt <prompt>", "Override the system prompt").action(async (options) => {
   const { model, prompt, provider, systemPrompt } = options;
+  if (options.debug) {
+    const { setDebugMode: setDebugMode2 } = await Promise.resolve().then(() => (init_debug(), debug_exports));
+    setDebugMode2(true);
+  }
+  const maxTurns = parseInt(options.maxTurns, 10) || 30;
   await loadProviderSettings();
   if (provider) {
     try {
@@ -4293,19 +3886,35 @@ program.name("darkfoo").description("Darkfoo Code \u2014 local AI coding assista
       controller.abort();
       process.exit(0);
     });
+    const jsonMode = options.outputFormat === "json";
+    let jsonContent = "";
+    const jsonToolCalls = [];
+    const jsonToolResults = [];
     for await (const event of query2({
       model: resolvedModel,
       messages: [userMsg],
       tools,
       systemPrompt: sysPrompt,
-      signal: controller.signal
+      signal: controller.signal,
+      maxTurns
     })) {
       switch (event.type) {
         case "text_delta":
-          process.stdout.write(event.text);
+          if (jsonMode) {
+            jsonContent += event.text;
+          } else {
+            process.stdout.write(event.text);
+          }
+          break;
+        case "tool_call":
+          if (jsonMode) {
+            jsonToolCalls.push({ name: event.toolCall.function.name, arguments: event.toolCall.function.arguments });
+          }
           break;
         case "tool_result":
-          if (event.isError) {
+          if (jsonMode) {
+            jsonToolResults.push({ tool: event.toolName, output: event.output, isError: event.isError });
+          } else if (event.isError) {
             process.stderr.write(`
 [${event.toolName}] Error: ${event.output}
 `);
@@ -4318,11 +3927,56 @@ Error: ${event.error}
           break;
       }
     }
-    process.stdout.write("\n");
+    if (jsonMode) {
+      const result = { role: "assistant", content: jsonContent };
+      if (jsonToolCalls.length > 0) result.toolCalls = jsonToolCalls;
+      if (jsonToolResults.length > 0) result.toolResults = jsonToolResults;
+      process.stdout.write(JSON.stringify(result) + "\n");
+    } else {
+      process.stdout.write("\n");
+    }
     process.exit(0);
   }
+  let initialMessages;
+  let initialSessionId;
+  if (options.continue) {
+    const sessions = await listSessions();
+    if (sessions.length > 0) {
+      const session = await loadSession(sessions[0].id);
+      if (session) {
+        initialMessages = session.messages;
+        initialSessionId = session.id;
+        process.stderr.write(`Resuming session: ${session.title}
+`);
+      }
+    } else {
+      process.stderr.write("No previous sessions found.\n");
+    }
+  } else if (options.resume) {
+    const session = await loadSession(options.resume);
+    if (session) {
+      initialMessages = session.messages;
+      initialSessionId = session.id;
+      process.stderr.write(`Resuming session: ${session.title}
+`);
+    } else {
+      process.stderr.write(`Session not found: ${options.resume}
+`);
+      process.exit(1);
+    }
+  }
   const { waitUntilExit } = render(
-    /* @__PURE__ */ jsx9(App, { model: resolvedModel, systemPromptOverride: systemPrompt, children: /* @__PURE__ */ jsx9(REPL, {}) })
+    /* @__PURE__ */ jsx9(
+      App,
+      {
+        model: resolvedModel,
+        systemPromptOverride: systemPrompt,
+        maxTurns,
+        initialMessages,
+        initialSessionId,
+        children: /* @__PURE__ */ jsx9(REPL, {})
+      }
+    )
   );
   await waitUntilExit();
 });