mini-coder 0.0.14 → 0.0.15

package/dist/mc.js

@@ -349,17 +349,6 @@ function renderMarkdown(text) {
   }).join(`
 `);
 }
-function renderChunk(text, inFence) {
-  let fence = inFence;
-  const output = text.split(`
-`).map((raw) => {
-    const r = renderLine(raw, fence);
-    fence = r.inFence;
-    return r.output;
-  }).join(`
-`);
-  return { output, inFence: fence };
-}
 
 // src/cli/tool-render.ts
 import { homedir as homedir2 } from "os";
@@ -433,7 +422,7 @@ function toolCallLine(name, args) {
   if (name === "shell") {
     const cmd = String(a.command ?? "");
     const shortCmd = cmd.length > 72 ? `${cmd.slice(0, 69)}\u2026` : cmd;
-    return `${G.run} ${c3.dim("$")} ${shortCmd}`;
+    return `${G.run} ${shortCmd}`;
   }
   if (name === "subagent") {
     const prompt = String(a.prompt ?? "");
@@ -474,19 +463,25 @@ function renderDiff(diff) {
     }
   }
 }
+function formatErrorBadge(result) {
+  const msg = typeof result === "string" ? result : result instanceof Error ? result.message : JSON.stringify(result);
+  const oneLiner = msg.split(`
+`)[0] ?? msg;
+  return `${G.err} ${c3.red(oneLiner)}`;
+}
+function formatShellBadge(r) {
+  return r.timedOut ? c3.yellow("timeout") : r.success ? c3.green(`\u2714 ${r.exitCode}`) : c3.red(`\u2716 ${r.exitCode}`);
+}
 function renderToolResultInline(toolName, result, isError, indent) {
   if (isError) {
-    const msg = typeof result === "string" ? result : result instanceof Error ? result.message : JSON.stringify(result);
-    const oneLiner = msg.split(`
-`)[0] ?? msg;
-    writeln(`${indent}${G.err} ${c3.red(oneLiner)}`);
+    writeln(`${indent}${formatErrorBadge(result)}`);
     return;
   }
   if (toolName === "glob") {
-    const r = result;
-    if (Array.isArray(r?.files)) {
-      const n = r.files.length;
-      writeln(`${indent}${G.info} ${c3.dim(n === 0 ? "no matches" : `${n} file${n === 1 ? "" : "s"}${r.truncated ? " (capped)" : ""}`)}`);
+    const res = result;
+    if (Array.isArray(res?.files)) {
+      const n = res.files.length;
+      writeln(`${indent}${G.info} ${c3.dim(n === 0 ? "no matches" : `${n} file${n === 1 ? "" : "s"}${res.truncated ? " (capped)" : ""}`)}`);
       return;
     }
   }
@@ -517,7 +512,7 @@ function renderToolResultInline(toolName, result, isError, indent) {
   }
   if (toolName === "shell") {
     const r = result;
-    const badge = r.timedOut ? c3.yellow("timeout") : r.success ? c3.green(`\u2714 ${r.exitCode}`) : c3.red(`\u2716 ${r.exitCode}`);
+    const badge = formatShellBadge(r);
     writeln(`${indent}${badge}`);
     return;
   }
@@ -556,10 +551,7 @@ function renderToolResultInline(toolName, result, isError, indent) {
 }
 function renderToolResult(toolName, result, isError) {
   if (isError) {
-    const msg = typeof result === "string" ? result : result instanceof Error ? result.message : JSON.stringify(result);
-    const oneLiner = msg.split(`
-`)[0] ?? msg;
-    writeln(`    ${G.err} ${c3.red(oneLiner)}`);
+    writeln(`    ${formatErrorBadge(result)}`);
     return;
   }
   if (toolName === "glob") {
@@ -635,7 +627,7 @@ function renderToolResult(toolName, result, isError) {
   }
   if (toolName === "shell") {
     const r = result;
-    const badge = r.timedOut ? c3.yellow("timeout") : r.success ? c3.green(`\u2714 ${r.exitCode}`) : c3.red(`\u2716 ${r.exitCode}`);
+    const badge = formatShellBadge(r);
     writeln(`    ${badge}`);
     const outLines = r.stdout ? r.stdout.split(`
 `) : [];
@@ -727,21 +719,16 @@ function normalizeParentLaneLabel(parentLabel) {
   const lanePath = (inner.split("\xB7")[0] ?? inner).trim();
   return lanePath || inner;
 }
-function shortWorktreeBranch(branch) {
-  const match = branch.match(/^(mc-sub-\d+)-\d+$/);
-  return match?.[1] ?? branch;
-}
-function formatSubagentLabel(laneId, parentLabel, worktreeBranch) {
+function formatSubagentLabel(laneId, parentLabel) {
   const parent = parentLabel ? normalizeParentLaneLabel(parentLabel) : "";
   const numStr = parent ? `${parent}.${laneId}` : `${laneId}`;
-  const branchHint = worktreeBranch ? `\xB7${shortWorktreeBranch(worktreeBranch)}` : "";
-  return c3.dim(c3.cyan(`[${numStr}${branchHint}]`));
+  return c3.dim(c3.cyan(`[${numStr}]`));
 }
 var laneBuffers = new Map;
 function renderSubagentEvent(event, opts) {
-  const { laneId, parentLabel, worktreeBranch, activeLanes } = opts;
-  const labelStr = formatSubagentLabel(laneId, parentLabel, worktreeBranch);
-  const prefix = activeLanes.size > 1 || worktreeBranch ? `${labelStr} ` : "";
+  const { laneId, parentLabel, hasWorktree, activeLanes } = opts;
+  const labelStr = formatSubagentLabel(laneId, parentLabel);
+  const prefix = activeLanes.size > 1 || hasWorktree ? `${labelStr} ` : "";
   if (event.type === "text-delta") {
     const buf = (laneBuffers.get(laneId) ?? "") + event.delta;
     const lines = buf.split(`
@@ -783,82 +770,46 @@ async function renderTurn(events, spinner) {
   let inText = false;
   let rawBuffer = "";
   let inFence = false;
-  let printQueue = "";
-  let printPos = 0;
-  let tickerHandle = null;
   let inputTokens = 0;
   let outputTokens = 0;
   let contextTokens = 0;
   let newMessages = [];
-  function enqueuePrint(ansi) {
-    printQueue += ansi;
-    if (tickerHandle === null) {
-      scheduleTick();
-    }
-  }
-  function tick() {
-    tickerHandle = null;
-    if (printPos < printQueue.length) {
-      process.stdout.write(printQueue[printPos]);
-      printPos++;
-      scheduleTick();
-    } else {
-      printQueue = "";
-      printPos = 0;
-    }
-  }
-  function scheduleTick() {
-    tickerHandle = setTimeout(tick, 8);
-  }
-  function drainQueue() {
-    if (tickerHandle !== null) {
-      clearTimeout(tickerHandle);
-      tickerHandle = null;
-    }
-    if (printPos < printQueue.length) {
-      process.stdout.write(printQueue.slice(printPos));
-    }
-    printQueue = "";
-    printPos = 0;
-  }
-  function renderAndTrim(end) {
-    const chunk = rawBuffer.slice(0, end);
-    const rendered = renderChunk(chunk, inFence);
+  function renderAndWrite(raw, endWithNewline) {
+    const rendered = renderLine(raw, inFence);
     inFence = rendered.inFence;
-    enqueuePrint(rendered.output);
-    rawBuffer = rawBuffer.slice(end);
+    write(rendered.output);
+    if (endWithNewline) {
+      write(`
+`);
+    }
   }
-  function flushChunks() {
+  function flushCompleteLines() {
     let boundary = rawBuffer.indexOf(`
-
 `);
-    if (boundary !== -1) {
-      renderAndTrim(boundary + 2);
-      flushChunks();
-      return;
-    }
-    boundary = rawBuffer.lastIndexOf(`
+    while (boundary !== -1) {
+      renderAndWrite(rawBuffer.slice(0, boundary), true);
+      rawBuffer = rawBuffer.slice(boundary + 1);
+      boundary = rawBuffer.indexOf(`
 `);
-    if (boundary !== -1) {
-      renderAndTrim(boundary + 1);
     }
   }
   function flushAll() {
-    if (rawBuffer) {
-      renderAndTrim(rawBuffer.length);
+    if (!rawBuffer) {
+      return;
     }
-    drainQueue();
+    renderAndWrite(rawBuffer, false);
+    rawBuffer = "";
   }
   for await (const event of events) {
     switch (event.type) {
       case "text-delta": {
         if (!inText) {
           spinner.stop();
-          process.stdout.write(`${G.reply} `);
+          write(`${G.reply} `);
           inText = true;
         }
         rawBuffer += event.delta;
-        flushChunks();
+        flushCompleteLines();
         break;
       }
       case "tool-call-start": {
@@ -957,7 +908,7 @@ function renderStatusBar(opts) {
     left.push(c5.magenta("\u21BB ralph"));
   const right = [];
   if (opts.inputTokens > 0 || opts.outputTokens > 0) {
-    right.push(c5.dim(`\u2191${fmtTokens(opts.inputTokens)} \u2193${fmtTokens(opts.outputTokens)}`));
+    right.push(c5.dim(`\u2191 ${fmtTokens(opts.inputTokens)} \u2193 ${fmtTokens(opts.outputTokens)}`));
   }
   if (opts.contextTokens > 0) {
     const ctxRaw = fmtTokens(opts.contextTokens);
@@ -995,7 +946,7 @@ function renderError(err, context = "render") {
 
 // src/cli/output.ts
 var HOME2 = homedir3();
-var PACKAGE_VERSION = "0.0.14";
+var PACKAGE_VERSION = "0.0.15";
 function tildePath(p) {
   return p.startsWith(HOME2) ? `~${p.slice(HOME2.length)}` : p;
 }
@@ -1041,7 +992,7 @@ function renderBanner(model, cwd) {
   writeln();
   writeln(`  ${c7.cyan("mc")}  ${c7.dim(`mini-coder \xB7 v${PACKAGE_VERSION}`)}`);
   writeln(`  ${c7.dim(model)}  ${c7.dim("\xB7")}  ${c7.dim(cwd)}`);
-  writeln(`  ${c7.dim("/help for commands  \xB7  ctrl+d to exit")}`);
+  writeln(`  ${c7.dim("/help for commands  \xB7  esc cancel  \xB7  ctrl+c/ctrl+d exit")}`);
   writeln();
 }
 function renderInfo(msg) {
@@ -1713,51 +1664,44 @@ async function fetchZenModels() {
   if (!key)
     return null;
   const payload = await fetchJson(`${ZEN_BASE}/models`, { headers: { Authorization: `Bearer ${key}` } }, 8000);
-  if (!isRecord(payload))
-    return null;
-  const data = payload.data;
-  if (!Array.isArray(data))
-    return null;
-  const out = [];
-  for (const item of data) {
-    if (!isRecord(item) || typeof item.id !== "string")
-      continue;
-    const modelId = normalizeModelId(item.id);
-    if (!modelId)
-      continue;
+  return processModelsList(payload, "data", "id", (item, modelId) => {
     const contextWindow = typeof item.context_window === "number" && Number.isFinite(item.context_window) ? Math.max(0, Math.trunc(item.context_window)) : null;
-    out.push({
+    return {
       providerModelId: modelId,
       displayName: item.id,
       contextWindow,
       free: item.id.endsWith("-free") || item.id === "gpt-5-nano" || item.id === "big-pickle"
-    });
-  }
-  return out;
+    };
+  });
 }
-async function fetchOpenAIModels() {
-  const key = process.env.OPENAI_API_KEY;
-  if (!key)
-    return null;
-  const payload = await fetchJson(`${OPENAI_BASE}/v1/models`, { headers: { Authorization: `Bearer ${key}` } }, 6000);
-  if (!isRecord(payload) || !Array.isArray(payload.data))
+function processModelsList(payload, arrayKey, idKey, mapper) {
+  if (!isRecord(payload) || !Array.isArray(payload[arrayKey]))
     return null;
   const out = [];
-  for (const item of payload.data) {
-    if (!isRecord(item) || typeof item.id !== "string")
+  for (const item of payload[arrayKey]) {
+    if (!isRecord(item) || typeof item[idKey] !== "string")
       continue;
-    const modelId = normalizeModelId(item.id);
+    const modelId = normalizeModelId(item[idKey]);
     if (!modelId)
       continue;
-    out.push({
-      providerModelId: modelId,
-      displayName: item.id,
-      contextWindow: null,
-      free: false
-    });
+    const mapped = mapper(item, modelId);
+    if (mapped)
+      out.push(mapped);
   }
   return out;
 }
+async function fetchOpenAIModels() {
+  const key = process.env.OPENAI_API_KEY;
+  if (!key)
+    return null;
+  const payload = await fetchJson(`${OPENAI_BASE}/v1/models`, { headers: { Authorization: `Bearer ${key}` } }, 6000);
+  return processModelsList(payload, "data", "id", (item, modelId) => ({
+    providerModelId: modelId,
+    displayName: item.id,
+    contextWindow: null,
+    free: false
+  }));
+}
 async function fetchAnthropicModels() {
   const key = process.env.ANTHROPIC_API_KEY;
   if (!key)
@@ -1768,75 +1712,48 @@ async function fetchAnthropicModels() {
       "anthropic-version": "2023-06-01"
     }
   }, 6000);
-  if (!isRecord(payload) || !Array.isArray(payload.data))
-    return null;
-  const out = [];
-  for (const item of payload.data) {
-    if (!isRecord(item) || typeof item.id !== "string")
-      continue;
-    const modelId = normalizeModelId(item.id);
-    if (!modelId)
-      continue;
+  return processModelsList(payload, "data", "id", (item, modelId) => {
     const displayName = typeof item.display_name === "string" && item.display_name.trim().length > 0 ? item.display_name : item.id;
-    out.push({
+    return {
       providerModelId: modelId,
       displayName,
       contextWindow: null,
       free: false
-    });
-  }
-  return out;
+    };
+  });
 }
 async function fetchGoogleModels() {
   const key = process.env.GOOGLE_API_KEY ?? process.env.GEMINI_API_KEY;
   if (!key)
     return null;
   const payload = await fetchJson(`${GOOGLE_BASE}/models?key=${encodeURIComponent(key)}`, {}, 6000);
-  if (!isRecord(payload) || !Array.isArray(payload.models))
-    return null;
-  const out = [];
-  for (const item of payload.models) {
-    if (!isRecord(item) || typeof item.name !== "string")
-      continue;
-    const modelId = normalizeModelId(item.name);
-    if (!modelId)
-      continue;
+  return processModelsList(payload, "models", "name", (item, modelId) => {
     const displayName = typeof item.displayName === "string" && item.displayName.trim().length > 0 ? item.displayName : modelId;
     const contextWindow = typeof item.inputTokenLimit === "number" && Number.isFinite(item.inputTokenLimit) ? Math.max(0, Math.trunc(item.inputTokenLimit)) : null;
-    out.push({
+    return {
       providerModelId: modelId,
       displayName,
       contextWindow,
       free: false
-    });
-  }
-  return out;
+    };
+  });
 }
 async function fetchOllamaModels() {
   const base = process.env.OLLAMA_BASE_URL ?? "http://localhost:11434";
   const payload = await fetchJson(`${base}/api/tags`, {}, 3000);
-  if (!isRecord(payload) || !Array.isArray(payload.models))
-    return null;
-  const out = [];
-  for (const item of payload.models) {
-    if (!isRecord(item) || typeof item.name !== "string")
-      continue;
-    const modelId = normalizeModelId(item.name);
-    if (!modelId)
-      continue;
+  return processModelsList(payload, "models", "name", (item, modelId) => {
     const details = item.details;
     let sizeSuffix = "";
     if (isRecord(details) && typeof details.parameter_size === "string") {
       sizeSuffix = ` (${details.parameter_size})`;
     }
-    out.push({
+    return {
       providerModelId: modelId,
       displayName: `${item.name}${sizeSuffix}`,
       contextWindow: null,
       free: false
-    });
-  }
-  return out;
+    };
+  });
 }
 async function fetchProviderCandidates(provider) {
   switch (provider) {
@@ -2464,31 +2381,22 @@ function deleteAllSnapshots(sessionId) {
 }
 // src/agent/subagent-runner.ts
 import { tmpdir as tmpdir2 } from "os";
-import { join as join15 } from "path";
+import { join as join10 } from "path";
 
 // src/llm-api/turn.ts
 import { dynamicTool, jsonSchema, stepCountIs, streamText } from "ai";
-import { z } from "zod";
 var MAX_STEPS = 50;
 function isZodSchema(s) {
   return s !== null && typeof s === "object" && "_def" in s;
 }
-function toCoreTool(def, claimWarning) {
+function toCoreTool(def) {
   const schema = isZodSchema(def.schema) ? def.schema : jsonSchema(def.schema);
   return dynamicTool({
     description: def.description,
     inputSchema: schema,
     execute: async (input) => {
       try {
-        const result = await def.execute(input);
-        if (claimWarning()) {
-          const warning = `
-
-<system-message>You have reached the maximum number of tool calls. ` + "No more tools will be available after this result. " + "Respond with a status update and list what still needs to be done.</system-message>";
-          const str = typeof result === "string" ? result : JSON.stringify(result);
-          return str + warning;
-        }
-        return result;
+        return await def.execute(input);
       } catch (err) {
         throw err instanceof Error ? err : new Error(String(err));
       }
@@ -2510,16 +2418,9 @@ async function* runTurn(options) {
     thinkingEffort
   } = options;
   let stepCount = 0;
-  let warningClaimed = false;
-  function claimWarning() {
-    if (stepCount !== MAX_STEPS - 2 || warningClaimed)
-      return false;
-    warningClaimed = true;
-    return true;
-  }
   const toolSet = {};
   for (const def of tools) {
-    toolSet[def.name] = toCoreTool(def, claimWarning);
+    toolSet[def.name] = toCoreTool(def);
   }
   let inputTokens = 0;
   let outputTokens = 0;
@@ -2554,7 +2455,6 @@ async function* runTurn(options) {
         outputTokens += step.usage?.outputTokens ?? 0;
         contextTokens = step.usage?.inputTokens ?? contextTokens;
         stepCount++;
-        warningClaimed = false;
       },
       prepareStep: ({ stepNumber }) => {
         if (stepNumber >= MAX_STEPS - 1) {
@@ -2610,7 +2510,7 @@ async function* runTurn(options) {
           };
           break;
         }
-        case "tool-error": {
+        case "tool-error":
           yield {
             type: "tool-result",
             toolCallId: String(c9.toolCallId ?? ""),
@@ -2619,15 +2519,13 @@ async function* runTurn(options) {
             isError: true
           };
           break;
-        }
         case "error": {
           const err = c9.error;
           throw err instanceof Error ? err : new Error(String(err));
         }
       }
     }
-    const finalResponse = await result.response;
-    const newMessages = finalResponse?.messages ?? [];
+    const newMessages = (await result.response)?.messages ?? [];
     logApiEvent("turn complete", {
       newMessagesCount: newMessages.length,
       inputTokens,
@@ -2897,75 +2795,62 @@ ${contextFile}`;
 }
 
 // src/tools/exa.ts
-import { z as z2 } from "zod";
-var ExaSearchSchema = z2.object({
-  query: z2.string().describe("The search query")
+import { z } from "zod";
+var ExaSearchSchema = z.object({
+  query: z.string().describe("The search query")
 });
+async function fetchExa(endpoint, body) {
+  const apiKey = process.env.EXA_API_KEY;
+  if (!apiKey) {
+    throw new Error("EXA_API_KEY is not set.");
+  }
+  const response = await fetch(`https://api.exa.ai/${endpoint}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "x-api-key": apiKey
+    },
+    body: JSON.stringify(body)
+  });
+  if (!response.ok) {
+    const errorBody = await response.text();
+    throw new Error(`Exa API error: ${response.status} ${response.statusText} - ${errorBody}`);
+  }
+  return await response.json();
+}
 var webSearchTool = {
   name: "webSearch",
   description: "Search the web for a query using Exa.",
   schema: ExaSearchSchema,
   execute: async (input) => {
-    const apiKey = process.env.EXA_API_KEY;
-    if (!apiKey) {
-      throw new Error("EXA_API_KEY is not set.");
-    }
-    const response = await fetch("https://api.exa.ai/search", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-api-key": apiKey
-      },
-      body: JSON.stringify({
-        query: input.query,
-        type: "auto",
-        numResults: 10,
-        contents: { text: { maxCharacters: 4000 } }
-      })
+    return fetchExa("search", {
+      query: input.query,
+      type: "auto",
+      numResults: 10,
+      contents: { text: { maxCharacters: 4000 } }
     });
-    if (!response.ok) {
-      const errorBody = await response.text();
-      throw new Error(`Exa API error: ${response.status} ${response.statusText} - ${errorBody}`);
-    }
-    return await response.json();
   }
 };
-var ExaContentSchema = z2.object({
-  urls: z2.array(z2.string()).max(3).describe("Array of URLs to retrieve content for (max 3)")
+var ExaContentSchema = z.object({
+  urls: z.array(z.string()).max(3).describe("Array of URLs to retrieve content for (max 3)")
 });
 var webContentTool = {
   name: "webContent",
   description: "Get the full content of specific URLs using Exa.",
   schema: ExaContentSchema,
   execute: async (input) => {
-    const apiKey = process.env.EXA_API_KEY;
-    if (!apiKey) {
-      throw new Error("EXA_API_KEY is not set.");
-    }
-    const response = await fetch("https://api.exa.ai/contents", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-api-key": apiKey
-      },
-      body: JSON.stringify({
-        urls: input.urls,
-        text: { maxCharacters: 1e4 }
-      })
+    return fetchExa("contents", {
+      urls: input.urls,
+      text: { maxCharacters: 1e4 }
     });
-    if (!response.ok) {
-      const errorBody = await response.text();
-      throw new Error(`Exa API error: ${response.status} ${response.statusText} - ${errorBody}`);
-    }
-    return await response.json();
   }
 };
 
 // src/tools/subagent.ts
-import { z as z3 } from "zod";
-var SubagentInput = z3.object({
-  prompt: z3.string().describe("The task or question to give the subagent"),
-  agentName: z3.string().optional().describe("Name of a custom agent to use (from .agents/agents/). Omit to use a generic subagent.")
+import { z as z2 } from "zod";
+var SubagentInput = z2.object({
+  prompt: z2.string().describe("The task or question to give the subagent"),
+  agentName: z2.string().optional().describe("Name of a custom agent to use (from .agents/agents/). Omit to use a generic subagent.")
 });
 function formatConflictFiles(conflictFiles) {
   if (conflictFiles.length === 0)
@@ -3011,8 +2896,8 @@ When the user's message contains @<agent-name>, delegate to that agent by settin
 
 // src/tools/create.ts
 import { existsSync as existsSync5, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname2, join as join7, relative } from "path";
-import { z as z4 } from "zod";
+import { dirname as dirname2 } from "path";
+import { z as z3 } from "zod";
 
 // src/tools/diff.ts
 function generateDiff(filePath, before, after) {
@@ -3140,19 +3025,50 @@ ${lines.join(`
 `);
 }
 
+// src/tools/shared.ts
+import { join as join7, relative } from "path";
+function resolvePath(cwdInput, pathInput) {
+  const cwd = cwdInput ?? process.cwd();
+  const filePath = pathInput.startsWith("/") ? pathInput : join7(cwd, pathInput);
+  const relPath = relative(cwd, filePath);
+  return { cwd, filePath, relPath };
+}
+async function resolveExistingFile(cwdInput, pathInput) {
+  const { cwd, filePath, relPath } = resolvePath(cwdInput, pathInput);
+  const file = Bun.file(filePath);
+  if (!await file.exists()) {
+    throw new Error(`File not found: "${relPath}". To create a new file use the \`create\` tool.`);
+  }
+  return { file, filePath, relPath, cwd };
+}
+function parseAnchor(value, name = "anchor") {
+  const normalized = value.trim().endsWith("|") ? value.trim().slice(0, -1) : value;
+  const match = /^\s*(\d+):([0-9a-fA-F]{2})\s*$/.exec(normalized);
+  if (!match) {
+    throw new Error(`Invalid ${name}. Expected format: "line:hh" (e.g. "11:a3").`);
+  }
+  const line = Number(match[1]);
+  if (!Number.isInteger(line) || line < 1) {
+    throw new Error(`Invalid ${name} line number.`);
+  }
+  const hash = match[2];
+  if (!hash) {
+    throw new Error(`Invalid ${name}. Expected format: "line:hh" (e.g. "11:a3").`);
+  }
+  return { line, hash: hash.toLowerCase() };
+}
+
 // src/tools/create.ts
-var CreateSchema = z4.object({
-  path: z4.string().describe("File path to write (absolute or relative to cwd)"),
-  content: z4.string().describe("Full content to write to the file")
+var CreateSchema = z3.object({
+  path: z3.string().describe("File path to write (absolute or relative to cwd)"),
+  content: z3.string().describe("Full content to write to the file")
 });
 var createTool = {
   name: "create",
   description: "Create a new file or fully overwrite an existing file with the given content. " + "Use this only for new files. " + "For targeted line edits on existing files, **use `replace` or `insert` instead**.",
   schema: CreateSchema,
   execute: async (input) => {
-    const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join7(cwd, input.path);
-    const relPath = relative(cwd, filePath);
+    const { filePath, relPath } = resolvePath(input.cwd, input.path);
     const dir = dirname2(filePath);
     if (!existsSync5(dir))
       mkdirSync5(dir, { recursive: true });
@@ -3166,8 +3082,8 @@ var createTool = {
 };
 
 // src/tools/glob.ts
-import { join as join9, relative as relative2 } from "path";
-import { z as z5 } from "zod";
+import { resolve as resolve2 } from "path";
+import { z as z4 } from "zod";
 
 // src/tools/ignore.ts
 import { join as join8 } from "path";
@@ -3181,10 +3097,40 @@ async function loadGitignore(cwd) {
   }
 }
 
+// src/tools/scan-path.ts
+import { relative as relative2, resolve, sep } from "path";
+var LEADING_PARENT_SEGMENTS = /^(?:\.\.\/)+/;
+function getScannedPathInfo(cwd, scanPath) {
+  const cwdAbsolute = resolve(cwd);
+  const absolute = resolve(cwdAbsolute, scanPath);
+  const relativePath = relative2(cwdAbsolute, absolute).replaceAll("\\", "/");
+  const inCwd = absolute === cwdAbsolute || absolute.startsWith(cwdAbsolute === sep ? sep : `${cwdAbsolute}${sep}`);
+  const ignoreTargets = getIgnoreTargets(relativePath, inCwd);
+  return {
+    absolute,
+    relativePath,
+    ignoreTargets,
+    inCwd
+  };
+}
+function getIgnoreTargets(path, inCwd) {
+  if (inCwd)
+    return [path];
+  const normalized = path.replace(LEADING_PARENT_SEGMENTS, "");
+  const segments = normalized.split("/").filter(Boolean);
+  if (segments.length === 0)
+    return [normalized];
+  const targets = new Set([normalized]);
+  for (let i = 1;i < segments.length; i++) {
+    targets.add(segments.slice(i).join("/"));
+  }
+  return [...targets];
+}
+
 // src/tools/glob.ts
-var GlobSchema = z5.object({
-  pattern: z5.string().describe("Glob pattern to match files against, e.g. '**/*.ts'"),
-  ignore: z5.array(z5.string()).optional().describe("Glob patterns to exclude")
+var GlobSchema = z4.object({
+  pattern: z4.string().describe("Glob pattern to match files against, e.g. '**/*.ts'"),
+  ignore: z4.array(z4.string()).optional().describe("Glob patterns to exclude")
 });
 var MAX_RESULTS = 500;
 var globTool = {
@@ -3200,18 +3146,22 @@ var globTool = {
     const glob = new Bun.Glob(input.pattern);
     const matches = [];
     for await (const file of glob.scan({ cwd, onlyFiles: true, dot: true })) {
-      if (ig?.ignores(file))
+      const { relativePath, ignoreTargets } = getScannedPathInfo(cwd, file);
+      const firstSegment = relativePath.split("/")[0] ?? "";
+      if (ignoreTargets.some((path) => ig?.ignores(path)))
         continue;
-      const firstSegment = file.split("/")[0] ?? "";
-      const ignored = ignoreGlobs.some((g) => g.match(file) || g.match(firstSegment));
+      const ignored = ignoreTargets.some((candidate) => ignoreGlobs.some((g) => g.match(candidate) || g.match(firstSegment)));
       if (ignored)
         continue;
       try {
-        const fullPath = join9(cwd, file);
+        const fullPath = resolve2(cwd, relativePath);
         const stat = await Bun.file(fullPath).stat?.() ?? null;
-        matches.push({ path: file, mtime: stat?.mtime?.getTime() ?? 0 });
+        matches.push({
+          path: relativePath,
+          mtime: stat?.mtime?.getTime() ?? 0
+        });
       } catch {
-        matches.push({ path: file, mtime: 0 });
+        matches.push({ path: relativePath, mtime: 0 });
       }
       if (matches.length >= MAX_RESULTS + 1)
         break;
@@ -3220,14 +3170,13 @@ var globTool = {
     if (truncated)
       matches.pop();
     matches.sort((a, b) => b.mtime - a.mtime);
-    const files = matches.map((m) => relative2(cwd, join9(cwd, m.path)));
+    const files = matches.map((m) => m.path);
     return { files, count: files.length, truncated };
   }
 };
 
 // src/tools/grep.ts
-import { join as join10 } from "path";
-import { z as z6 } from "zod";
+import { z as z5 } from "zod";
 
 // src/tools/hashline.ts
 var FNV_OFFSET_BASIS = 2166136261;
@@ -3273,17 +3222,17 @@ function findLineByHash(lines, hash, hintLine) {
 }
 
 // src/tools/grep.ts
-var GrepSchema = z6.object({
-  pattern: z6.string().describe("Regular expression to search for"),
-  include: z6.string().optional().describe("Glob pattern to filter files, e.g. '*.ts' or '*.{ts,tsx}'"),
-  contextLines: z6.number().int().min(0).max(10).optional().default(2).describe("Lines of context to include around each match"),
-  caseSensitive: z6.boolean().optional().default(true),
-  maxResults: z6.number().int().min(1).max(200).optional().default(50)
+var GrepSchema = z5.object({
+  pattern: z5.string().describe("Regular expression to search for"),
+  include: z5.string().optional().describe("Glob pattern to filter files, e.g. '*.ts' or '*.{ts,tsx}'"),
+  contextLines: z5.number().int().min(0).max(10).optional().default(2).describe("Lines of context to include around each match"),
+  caseSensitive: z5.boolean().optional().default(true),
+  maxResults: z5.number().int().min(1).max(200).optional().default(50)
 });
 var DEFAULT_IGNORE = [
-  "node_modules",
-  ".git",
-  "dist",
+  "node_modules/**",
+  ".git/**",
+  "dist/**",
   "*.db",
   "*.db-shm",
   "*.db-wal",
@@ -3306,18 +3255,19 @@ var grepTool = {
     let truncated = false;
     const ig = await loadGitignore(cwd);
     outer:
-      for await (const relPath of fileGlob.scan({
+      for await (const fromPath of fileGlob.scan({
         cwd,
         onlyFiles: true,
         dot: true
       })) {
-        if (ig?.ignores(relPath))
+        const { absolute, relativePath, ignoreTargets } = getScannedPathInfo(cwd, fromPath);
+        const firstSegment = relativePath.split("/")[0] ?? "";
+        if (ignoreTargets.some((path) => ig?.ignores(path)))
           continue;
-        const firstSegment = relPath.split("/")[0] ?? "";
-        if (ignoreGlob.some((g) => g.match(relPath) || g.match(firstSegment))) {
+        if (ignoreTargets.some((candidate) => ignoreGlob.some((g) => g.match(candidate) || g.match(firstSegment)))) {
           continue;
         }
-        const fullPath = join10(cwd, relPath);
+        const fullPath = absolute;
         let text;
         try {
           text = await Bun.file(fullPath).text();
@@ -3344,7 +3294,7 @@ var grepTool = {
             });
           }
           allMatches.push({
-            file: relPath,
+            file: relativePath,
             line: i + 1,
             column: match.index + 1,
             text: formatHashLine(i + 1, line),
@@ -3369,7 +3319,7 @@ var grepTool = {
 // src/tools/hooks.ts
 import { constants, accessSync } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join11 } from "path";
+import { join as join9 } from "path";
 function isExecutable(filePath) {
   try {
     accessSync(filePath, constants.X_OK);
@@ -3381,8 +3331,8 @@ function isExecutable(filePath) {
 function findHook(toolName, cwd) {
   const scriptName = `post-${toolName}`;
   const candidates = [
-    join11(cwd, ".agents", "hooks", scriptName),
-    join11(homedir7(), ".agents", "hooks", scriptName)
+    join9(cwd, ".agents", "hooks", scriptName),
+    join9(homedir7(), ".agents", "hooks", scriptName)
   ];
   for (const p of candidates) {
     if (isExecutable(p))
@@ -3471,13 +3421,12 @@ function hookEnvForRead(input, cwd) {
 }
 
 // src/tools/insert.ts
-import { join as join12, relative as relative3 } from "path";
-import { z as z7 } from "zod";
-var InsertSchema = z7.object({
-  path: z7.string().describe("File path to edit (absolute or relative to cwd)"),
-  anchor: z7.string().describe('Anchor line from a prior read/grep, e.g. "11:a3"'),
-  position: z7.enum(["before", "after"]).describe('Insert the content "before" or "after" the anchor line'),
-  content: z7.string().describe("Text to insert")
+import { z as z6 } from "zod";
+var InsertSchema = z6.object({
+  path: z6.string().describe("File path to edit (absolute or relative to cwd)"),
+  anchor: z6.string().describe('Anchor line from a prior read/grep, e.g. "11:a3"'),
+  position: z6.enum(["before", "after"]).describe('Insert the content "before" or "after" the anchor line'),
+  content: z6.string().describe("Text to insert")
 });
 var HASH_NOT_FOUND_ERROR = "Hash not found. Re-read the file to get current anchors.";
 var insertTool = {
@@ -3485,13 +3434,7 @@ var insertTool = {
   description: "Insert new lines before or after an anchor line in an existing file. " + "The anchor line itself is not modified. " + 'Anchors come from the `read` or `grep` tools (format: "line:hash", e.g. "11:a3"). ' + "To replace or delete lines use `replace`. To create a file use `create`.",
   schema: InsertSchema,
   execute: async (input) => {
-    const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join12(cwd, input.path);
-    const relPath = relative3(cwd, filePath);
-    const file = Bun.file(filePath);
-    if (!await file.exists()) {
-      throw new Error(`File not found: "${relPath}". To create a new file use the \`create\` tool.`);
-    }
+    const { file, filePath, relPath } = await resolveExistingFile(input.cwd, input.path);
     const parsed = parseAnchor(input.anchor);
     const original = await file.text();
     const lines = original.split(`
@@ -3514,30 +3457,13 @@ var insertTool = {
     return { path: relPath, diff };
   }
 };
-function parseAnchor(value) {
-  const normalized = value.trim().endsWith("|") ? value.trim().slice(0, -1) : value;
-  const match = /^\s*(\d+):([0-9a-fA-F]{2})\s*$/.exec(normalized);
-  if (!match) {
-    throw new Error(`Invalid anchor. Expected format: "line:hh" (e.g. "11:a3").`);
-  }
-  const line = Number(match[1]);
-  if (!Number.isInteger(line) || line < 1) {
-    throw new Error("Invalid anchor line number.");
-  }
-  const hash = match[2];
-  if (!hash) {
-    throw new Error(`Invalid anchor. Expected format: "line:hh" (e.g. "11:a3").`);
-  }
-  return { line, hash: hash.toLowerCase() };
-}
 
 // src/tools/read.ts
-import { join as join13, relative as relative4 } from "path";
-import { z as z8 } from "zod";
-var ReadSchema = z8.object({
-  path: z8.string().describe("File path to read (absolute or relative to cwd)"),
-  line: z8.number().int().min(1).optional().describe("1-indexed starting line (default: 1)"),
-  count: z8.number().int().min(1).max(500).optional().describe("Lines to read (default: 500, max: 500)")
+import { z as z7 } from "zod";
+var ReadSchema = z7.object({
+  path: z7.string().describe("File path to read (absolute or relative to cwd)"),
+  line: z7.number().int().min(1).optional().describe("1-indexed starting line (default: 1)"),
+  count: z7.number().int().min(1).max(500).optional().describe("Lines to read (default: 500, max: 500)")
 });
 var MAX_COUNT = 500;
 var MAX_BYTES = 1e6;
@@ -3546,8 +3472,7 @@ var readTool = {
   description: "Read a file's contents. `line` sets the starting line (1-indexed, default 1). " + "`count` sets how many lines to read (default 500, max 500). " + "Check `truncated` and `totalLines` in the result to detect when more content exists; " + "paginate by incrementing `line`.",
   schema: ReadSchema,
   execute: async (input) => {
-    const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join13(cwd, input.path);
+    const { filePath, relPath } = resolvePath(input.cwd, input.path);
     const file = Bun.file(filePath);
     const exists = await file.exists();
     if (!exists) {
@@ -3570,7 +3495,7 @@ var readTool = {
     const content = selectedLines.map((line, i) => formatHashLine(clampedStart + i, line)).join(`
 `);
     return {
-      path: relative4(cwd, filePath),
+      path: relPath,
       content,
       totalLines,
       line: clampedStart,
@@ -3580,13 +3505,12 @@ var readTool = {
 };
 
 // src/tools/replace.ts
-import { join as join14, relative as relative5 } from "path";
-import { z as z9 } from "zod";
-var ReplaceSchema = z9.object({
-  path: z9.string().describe("File path to edit (absolute or relative to cwd)"),
-  startAnchor: z9.string().describe('Start anchor from a prior read/grep, e.g. "11:a3"'),
-  endAnchor: z9.string().optional().describe('End anchor (inclusive), e.g. "33:0e". Omit to target only the startAnchor line.'),
-  newContent: z9.string().optional().describe("Replacement text. Omit or pass empty string to delete the range.")
+import { z as z8 } from "zod";
+var ReplaceSchema = z8.object({
+  path: z8.string().describe("File path to edit (absolute or relative to cwd)"),
+  startAnchor: z8.string().describe('Start anchor from a prior read/grep, e.g. "11:a3"'),
+  endAnchor: z8.string().optional().describe('End anchor (inclusive), e.g. "33:0e". Omit to target only the startAnchor line.'),
+  newContent: z8.string().optional().describe("Replacement text. Omit or pass empty string to delete the range.")
 });
 var HASH_NOT_FOUND_ERROR2 = "Hash not found. Re-read the file to get current anchors.";
 var replaceTool = {
@@ -3594,15 +3518,9 @@ var replaceTool = {
   description: "Replace or delete a range of lines in an existing file using hashline anchors. " + 'Anchors come from the `read` or `grep` tools (format: "line:hash", e.g. "11:a3"). ' + "Provide startAnchor alone to target a single line, or add endAnchor for a range. " + "Set newContent to the replacement text, or omit it to delete the range. " + "To create a file use `create`. To insert without replacing any lines use `insert`.",
   schema: ReplaceSchema,
   execute: async (input) => {
-    const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join14(cwd, input.path);
-    const relPath = relative5(cwd, filePath);
-    const file = Bun.file(filePath);
-    if (!await file.exists()) {
-      throw new Error(`File not found: "${relPath}". To create a new file use the \`create\` tool.`);
-    }
-    const start = parseAnchor2(input.startAnchor, "startAnchor");
-    const end = input.endAnchor ? parseAnchor2(input.endAnchor, "endAnchor") : null;
+    const { file, filePath, relPath } = await resolveExistingFile(input.cwd, input.path);
+    const start = parseAnchor(input.startAnchor, "startAnchor");
+    const end = input.endAnchor ? parseAnchor(input.endAnchor, "endAnchor") : null;
     if (end && end.line < start.line) {
       throw new Error("endAnchor line number must be >= startAnchor line number.");
     }
@@ -3636,29 +3554,13 @@ var replaceTool = {
     return { path: relPath, diff, deleted: replacement.length === 0 };
   }
 };
-function parseAnchor2(value, name) {
-  const normalized = value.trim().endsWith("|") ? value.trim().slice(0, -1) : value;
-  const match = /^\s*(\d+):([0-9a-fA-F]{2})\s*$/.exec(normalized);
-  if (!match) {
-    throw new Error(`Invalid ${name}. Expected format: "line:hh" (e.g. "11:a3").`);
-  }
-  const line = Number(match[1]);
-  if (!Number.isInteger(line) || line < 1) {
-    throw new Error(`Invalid ${name} line number.`);
-  }
-  const hash = match[2];
-  if (!hash) {
-    throw new Error(`Invalid ${name}. Expected format: "line:hh" (e.g. "11:a3").`);
-  }
-  return { line, hash: hash.toLowerCase() };
-}
 
 // src/tools/shell.ts
-import { z as z10 } from "zod";
-var ShellSchema = z10.object({
-  command: z10.string().describe("Shell command to execute"),
-  timeout: z10.number().int().min(1000).max(300000).optional().default(30000).describe("Timeout in milliseconds (default: 30s, max: 5min)"),
-  env: z10.record(z10.string(), z10.string()).optional().describe("Additional environment variables to set")
+import { z as z9 } from "zod";
+var ShellSchema = z9.object({
+  command: z9.string().describe("Shell command to execute"),
+  timeout: z9.number().int().min(1000).max(300000).optional().default(30000).describe("Timeout in milliseconds (default: 30s, max: 5min)"),
+  env: z9.record(z9.string(), z9.string()).optional().describe("Additional environment variables to set")
 });
 var MAX_OUTPUT_BYTES = 1e4;
 var shellTool = {
@@ -3832,14 +3734,12 @@ function buildReadOnlyToolSet(opts) {
 
 // src/agent/subagent-runner.ts
 function makeWorktreeBranch(laneId) {
-  return `mc-sub-${laneId}-${Date.now()}`;
+  return `mc-sub-${laneId}`;
 }
 function makeWorktreePath(laneId) {
-  const suffix = crypto.randomUUID().replace(/-/g, "").slice(0, 10);
-  return join15(tmpdir2(), `mc-wt-${laneId}-${suffix}`);
+  return join10(tmpdir2(), `mc-wt-${laneId}`);
 }
 function createSubagentRunner(cwd, reporter, getCurrentModel, getThinkingEffort) {
-  let nextLaneId = 1;
   const activeLanes = new Set;
   const worktreesEnabledPromise = isGitRepo(cwd);
   let mergeLock = Promise.resolve();
@@ -3853,7 +3753,7 @@ function createSubagentRunner(cwd, reporter, getCurrentModel, getThinkingEffort)
     return task;
   };
   const runSubagent = async (prompt, depth = 0, agentName, modelOverride, parentLabel) => {
-    const laneId = nextLaneId++;
+    const laneId = crypto.randomUUID().split("-")[0];
     activeLanes.add(laneId);
     let subagentCwd = cwd;
     let worktreeBranch;
@@ -3907,7 +3807,7 @@ function createSubagentRunner(cwd, reporter, getCurrentModel, getThinkingEffort)
         reporter.renderSubagentEvent(event, {
           laneId,
           ...parentLabel ? { parentLabel } : {},
-          ...worktreeBranch ? { worktreeBranch } : {},
+          hasWorktree: !!worktreeBranch,
           activeLanes
         });
         reporter.startSpinner("thinking");
@@ -3976,7 +3876,7 @@ function createSubagentRunner(cwd, reporter, getCurrentModel, getThinkingEffort)
 
 // src/tools/snapshot.ts
 import { readFileSync as readFileSync3, unlinkSync as unlinkSync2 } from "fs";
-import { join as join16 } from "path";
+import { join as join11 } from "path";
 async function gitBytes(args, cwd) {
   try {
     const proc = Bun.spawn(["git", ...args], {
@@ -4067,7 +3967,7 @@ async function takeSnapshot(cwd, sessionId, turnIndex) {
       return false;
     const files = [];
     for (const entry of entries) {
-      const absPath = join16(repoRoot, entry.path);
+      const absPath = join11(repoRoot, entry.path);
       if (!entry.existsOnDisk) {
         const { bytes, code } = await gitBytes(["show", `HEAD:${entry.path}`], repoRoot);
         if (code === 0) {
@@ -4116,7 +4016,7 @@ async function restoreSnapshot(cwd, sessionId, turnIndex) {
     const root = repoRoot ?? cwd;
     let anyFailed = false;
     for (const file of files) {
-      const absPath = join16(root, file.path);
+      const absPath = join11(root, file.path);
       if (!file.existed) {
         try {
           if (await Bun.file(absPath).exists()) {
@@ -4183,7 +4083,7 @@ async function undoLastTurn(ctx) {
 }
 
 // src/agent/agent-helpers.ts
-import { join as join17 } from "path";
+import { join as join12 } from "path";
 import * as c9 from "yoctocolors";
 
 // src/cli/image-types.ts
@@ -4282,7 +4182,7 @@ ${skill.content}
       result = result.slice(0, match.index) + replacement + result.slice((match.index ?? 0) + match[0].length);
       continue;
     }
-    const filePath = ref.startsWith("/") ? ref : join17(cwd, ref);
+    const filePath = ref.startsWith("/") ? ref : join12(cwd, ref);
     if (isImageFilename(ref)) {
       const attachment = await loadImageFile(filePath);
       if (attachment) {
@@ -4731,7 +4631,7 @@ function handleHelp(ctx, custom) {
   writeln(`  ${c10.green("@file".padEnd(26))} ${c10.dim("inject file contents into prompt (Tab to complete)")}`);
   writeln(`  ${c10.green("!cmd".padEnd(26))} ${c10.dim("run shell command, output added as context")}`);
   writeln();
-  writeln(`  ${c10.dim("ctrl+c")}  cancel  ${c10.dim("\xB7")}  ${c10.dim("ctrl+d")}  exit  ${c10.dim("\xB7")}  ${c10.dim("ctrl+r")}  history search  ${c10.dim("\xB7")}  ${c10.dim("\u2191\u2193")}  history`);
+  writeln(`  ${c10.dim("esc")}  cancel response  ${c10.dim("\xB7")}  ${c10.dim("ctrl+c")}  exit  ${c10.dim("\xB7")}  ${c10.dim("ctrl+d")}  exit  ${c10.dim("\xB7")}  ${c10.dim("ctrl+r")}  history search  ${c10.dim("\xB7")}  ${c10.dim("\u2191\u2193")}  history`);
   writeln();
 }
 async function handleCommand(command, args, ctx) {
@@ -4778,7 +4678,7 @@ async function handleCommand(command, args, ctx) {
 }
 
 // src/cli/input.ts
-import { join as join18, relative as relative6 } from "path";
+import { join as join13, relative as relative3 } from "path";
 import * as c11 from "yoctocolors";
 var ESC = "\x1B";
 var CSI = `${ESC}[`;
@@ -4807,6 +4707,8 @@ var CTRL_K = "\v";
 var CTRL_L = "\f";
 var CTRL_R = "\x12";
 var TAB = "\t";
+var ESC_BYTE = 27;
+var CTRL_C_BYTE = 3;
 async function getAtCompletions(prefix, cwd) {
   const query = prefix.startsWith("@") ? prefix.slice(1) : prefix;
   const results = [];
@@ -4830,7 +4732,7 @@ async function getAtCompletions(prefix, cwd) {
     for await (const file of glob.scan({ cwd, onlyFiles: true })) {
       if (file.includes("node_modules") || file.includes(".git"))
         continue;
-      results.push(`@${relative6(cwd, join18(cwd, file))}`);
+      results.push(`@${relative3(cwd, join13(cwd, file))}`);
       if (results.length >= MAX)
         break;
     }
@@ -4852,7 +4754,7 @@ async function tryExtractImageFromPaste(pasted, cwd) {
     }
   }
   if (!trimmed.includes(" ") && isImageFilename(trimmed)) {
-    const filePath = trimmed.startsWith("/") ? trimmed : join18(cwd, trimmed);
+    const filePath = trimmed.startsWith("/") ? trimmed : join13(cwd, trimmed);
     const attachment = await loadImageFile(filePath);
     if (attachment) {
       const name = filePath.split("/").pop() ?? trimmed;
@@ -4889,35 +4791,67 @@ async function readKey(reader) {
     return "";
   return new TextDecoder().decode(value);
 }
-function watchForInterrupt(abortController) {
-  if (!process.stdin.isTTY)
+function getTurnControlAction(chunk) {
+  for (const byte of chunk) {
+    if (byte === ESC_BYTE)
+      return "cancel";
+    if (byte === CTRL_C_BYTE)
+      return "quit";
+  }
+  return null;
+}
+function exitOnCtrlC(opts) {
+  if (opts?.printNewline)
+    process.stdout.write(`
+`);
+  if (opts?.disableBracketedPaste)
+    process.stdout.write(BPASTE_DISABLE);
+  terminal.setInterruptHandler(null);
+  terminal.setRawMode(false);
+  process.stdin.pause();
+  terminal.restoreTerminal();
+  process.exit(130);
+}
+function watchForCancel(abortController) {
+  if (!terminal.isTTY)
     return () => {};
-  const onInterrupt = () => {
+  const onCancel = () => {
     cleanup();
     abortController.abort();
   };
   const onData = (chunk) => {
-    for (const byte of chunk) {
-      if (byte === 3) {
-        onInterrupt();
-        return;
-      }
+    const action = getTurnControlAction(chunk);
+    if (action === "cancel") {
+      onCancel();
+      return;
+    }
+    if (action === "quit") {
+      cleanup();
+      exitOnCtrlC({ printNewline: true });
     }
   };
   const cleanup = () => {
     process.stdin.removeListener("data", onData);
     terminal.setInterruptHandler(null);
-    process.stdin.setRawMode(false);
+    terminal.setRawMode(false);
     process.stdin.pause();
   };
-  terminal.setInterruptHandler(onInterrupt);
-  process.stdin.setRawMode(true);
+  terminal.setInterruptHandler(onCancel);
+  terminal.setRawMode(true);
   process.stdin.resume();
   process.stdin.on("data", onData);
   return cleanup;
 }
-var PASTE_SENTINEL = "\x00PASTE\x00";
-var PASTE_SENTINEL_LEN = PASTE_SENTINEL.length;
+var PASTE_TOKEN_START = 57344;
+var PASTE_TOKEN_END = 63743;
+function createPasteToken(buf, pasteTokens) {
+  for (let code = PASTE_TOKEN_START;code <= PASTE_TOKEN_END; code++) {
+    const token = String.fromCharCode(code);
+    if (!buf.includes(token) && !pasteTokens.has(token))
+      return token;
+  }
+  throw new Error("Too many pasted chunks in a single prompt");
+}
 function pasteLabel(text) {
   const lines = text.split(`
 `);
@@ -4927,6 +4861,58 @@ function pasteLabel(text) {
   const more = extra > 0 ? ` +${extra} more line${extra === 1 ? "" : "s"}` : "";
   return `[pasted: "${preview}"${more}]`;
 }
+function processInputBuffer(buf, pasteTokens, replacer) {
+  let out = "";
+  for (let i = 0;i < buf.length; i++) {
+    const ch = buf[i] ?? "";
+    out += replacer(ch, pasteTokens.get(ch));
+  }
+  return out;
+}
+function renderInputBuffer(buf, pasteTokens) {
+  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ? pasteLabel(pasted) : ch);
+}
+function expandInputBuffer(buf, pasteTokens) {
+  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ?? ch);
+}
+function pruneInputPasteTokens(pasteTokens, ...buffers) {
+  const referenced = buffers.join("");
+  const next = new Map;
+  for (const [token, text] of pasteTokens) {
+    if (referenced.includes(token))
+      next.set(token, text);
+  }
+  return next;
+}
+function getVisualCursor(buf, cursor, pasteTokens) {
+  let visual = 0;
+  for (let i = 0;i < Math.min(cursor, buf.length); i++) {
+    const ch = buf[i] ?? "";
+    const pasted = pasteTokens.get(ch);
+    visual += pasted ? pasteLabel(pasted).length : 1;
+  }
+  return visual;
+}
+function buildPromptDisplay(text, cursor, maxLen) {
+  const clampedCursor = Math.max(0, Math.min(cursor, text.length));
+  if (maxLen <= 0)
+    return { display: "", cursor: 0 };
+  if (text.length <= maxLen)
+    return { display: text, cursor: clampedCursor };
+  let start = Math.max(0, clampedCursor - maxLen);
+  const end = Math.min(text.length, start + maxLen);
+  if (end - start < maxLen)
+    start = Math.max(0, end - maxLen);
+  let display = text.slice(start, end);
+  if (start > 0 && display.length > 0)
+    display = `\u2026${display.slice(1)}`;
+  if (end < text.length && display.length > 0)
+    display = `${display.slice(0, -1)}\u2026`;
+  return {
+    display,
+    cursor: Math.min(clampedCursor - start, display.length)
+  };
+}
 var PROMPT = c11.green("\u25B6 ");
 var PROMPT_PLAN = c11.yellow("\u2B22 ");
 var PROMPT_RALPH = c11.magenta("\u21BB ");
@@ -4940,24 +4926,44 @@ async function readline(opts) {
   let savedInput = "";
   let searchMode = false;
   let searchQuery = "";
-  let pasteBuffer = null;
+  const pasteTokens = new Map;
   const imageAttachments = [];
-  process.stdin.setRawMode(true);
+  function prunePasteTokens() {
+    const next = pruneInputPasteTokens(pasteTokens, buf, savedInput);
+    pasteTokens.clear();
+    for (const [token, text] of next)
+      pasteTokens.set(token, text);
+  }
+  function insertText(text) {
+    buf = buf.slice(0, cursor) + text + buf.slice(cursor);
+    cursor += text.length;
+  }
+  function deleteWordBackward() {
+    const end = cursor;
+    while (cursor > 0 && buf[cursor - 1] === " ")
+      cursor--;
+    while (cursor > 0 && buf[cursor - 1] !== " ")
+      cursor--;
+    buf = buf.slice(0, cursor) + buf.slice(end);
+    prunePasteTokens();
+    renderPrompt();
+  }
+  function insertPasteToken(text) {
+    const token = createPasteToken(buf, pasteTokens);
+    pasteTokens.set(token, text);
+    insertText(token);
+  }
+  terminal.setRawMode(true);
   process.stdin.resume();
   process.stdout.write(BPASTE_ENABLE);
   const reader = getStdinReader();
   function renderPrompt() {
     const cols = process.stdout.columns ?? 80;
-    const visualBuf = (pasteBuffer ? buf.replace(PASTE_SENTINEL, c11.dim(pasteLabel(pasteBuffer))) : buf).replace(/\[image: [^\]]+\]/g, (m) => c11.dim(c11.cyan(m)));
-    const visualCursor = pasteBuffer ? (() => {
-      const sentinelPos = buf.indexOf(PASTE_SENTINEL);
-      if (sentinelPos === -1 || cursor <= sentinelPos)
-        return cursor;
-      return cursor - PASTE_SENTINEL_LEN + pasteLabel(pasteBuffer).length;
-    })() : cursor;
-    const display = visualBuf.length > cols - PROMPT_RAW_LEN - 2 ? `\u2026${visualBuf.slice(-(cols - PROMPT_RAW_LEN - 3))}` : visualBuf;
+    const visualBuf = renderInputBuffer(buf, pasteTokens);
+    const visualCursor = getVisualCursor(buf, cursor, pasteTokens);
+    const { display, cursor: displayCursor } = buildPromptDisplay(visualBuf, visualCursor, Math.max(1, cols - PROMPT_RAW_LEN - 2));
     const prompt = opts.planMode ? PROMPT_PLAN : opts.ralphMode ? PROMPT_RALPH : PROMPT;
-    process.stdout.write(`${CLEAR_LINE}${prompt}${display}${CSI}${PROMPT_RAW_LEN + visualCursor + 1}G`);
+    process.stdout.write(`${CLEAR_LINE}${prompt}${display}${CSI}${PROMPT_RAW_LEN + displayCursor + 1}G`);
   }
   function renderSearchPrompt() {
     process.stdout.write(`${CLEAR_LINE}${c11.cyan("search:")} ${searchQuery}\u2588`);
@@ -4969,6 +4975,7 @@ async function readline(opts) {
       buf = savedInput;
     }
     cursor = buf.length;
+    prunePasteTokens();
     renderPrompt();
   }
   renderPrompt();
@@ -5018,14 +5025,11 @@ async function readline(opts) {
         const imageResult = await tryExtractImageFromPaste(pasted, cwd);
         if (imageResult) {
           imageAttachments.push(imageResult.attachment);
-          buf = buf.slice(0, cursor) + imageResult.label + buf.slice(cursor);
-          cursor += imageResult.label.length;
+          insertText(imageResult.label);
           renderPrompt();
           continue;
         }
-        pasteBuffer = pasted;
-        buf = buf.slice(0, cursor) + PASTE_SENTINEL + buf.slice(cursor);
-        cursor += PASTE_SENTINEL_LEN;
+        insertPasteToken(pasted);
         renderPrompt();
         continue;
       }
@@ -5077,15 +5081,7 @@ async function readline(opts) {
           continue;
         }
         if (raw === `${ESC}${BACKSPACE}`) {
-          const end = cursor;
-          while (cursor > 0 && buf[cursor - 1] === " ")
-            cursor--;
-          while (cursor > 0 && buf[cursor - 1] !== " ")
-            cursor--;
-          buf = buf.slice(0, cursor) + buf.slice(end);
-          if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
-            pasteBuffer = null;
-          renderPrompt();
+          deleteWordBackward();
           continue;
         }
         if (raw === ESC) {
@@ -5096,9 +5092,7 @@ async function readline(opts) {
         continue;
       }
       if (raw === CTRL_C) {
-        process.stdout.write(`
-`);
-        return { type: "interrupt" };
+        exitOnCtrlC({ printNewline: true, disableBracketedPaste: true });
       }
       if (raw === CTRL_D) {
         process.stdout.write(`
@@ -5116,29 +5110,19 @@ async function readline(opts) {
         continue;
       }
       if (raw === CTRL_W) {
-        const end = cursor;
-        while (cursor > 0 && buf[cursor - 1] === " ")
-          cursor--;
-        while (cursor > 0 && buf[cursor - 1] !== " ")
-          cursor--;
-        buf = buf.slice(0, cursor) + buf.slice(end);
-        if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
-          pasteBuffer = null;
-        renderPrompt();
+        deleteWordBackward();
         continue;
       }
       if (raw === CTRL_U) {
         buf = buf.slice(cursor);
         cursor = 0;
-        if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
-          pasteBuffer = null;
+        prunePasteTokens();
         renderPrompt();
         continue;
       }
       if (raw === CTRL_K) {
         buf = buf.slice(0, cursor);
-        if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
-          pasteBuffer = null;
+        prunePasteTokens();
         renderPrompt();
         continue;
       }
@@ -5157,8 +5141,7 @@ async function readline(opts) {
         if (cursor > 0) {
           buf = buf.slice(0, cursor - 1) + buf.slice(cursor);
           cursor--;
-          if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
-            pasteBuffer = null;
+          prunePasteTokens();
           renderPrompt();
         }
         continue;
@@ -5185,8 +5168,8 @@ async function readline(opts) {
         continue;
       }
       if (raw === ENTER || raw === NEWLINE) {
-        const expanded = pasteBuffer ? buf.replace(PASTE_SENTINEL, pasteBuffer) : buf;
-        pasteBuffer = null;
+        const expanded = expandInputBuffer(buf, pasteTokens);
+        pasteTokens.clear();
         const text = expanded.trim();
         process.stdout.write(`
 `);
@@ -5215,30 +5198,31 @@ async function readline(opts) {
         };
       }
       if (raw.length > 1) {
-        const pasted = raw.replace(/\r?\n$/, "");
-        const imageResult = await tryExtractImageFromPaste(pasted, cwd);
+        const chunk = raw.replace(/\r?\n$/, "");
+        const imageResult = await tryExtractImageFromPaste(chunk, cwd);
         if (imageResult) {
           imageAttachments.push(imageResult.attachment);
-          buf = buf.slice(0, cursor) + imageResult.label + buf.slice(cursor);
-          cursor += imageResult.label.length;
+          insertText(imageResult.label);
           renderPrompt();
           continue;
         }
-        pasteBuffer = pasted;
-        buf = buf.slice(0, cursor) + PASTE_SENTINEL + buf.slice(cursor);
-        cursor += PASTE_SENTINEL_LEN;
+        if (chunk.includes(`
+`) || chunk.includes("\r")) {
+          insertPasteToken(chunk);
+        } else {
+          insertText(chunk);
+        }
         renderPrompt();
         continue;
       }
       if (raw >= " " || raw === "\t") {
-        buf = buf.slice(0, cursor) + raw + buf.slice(cursor);
-        cursor++;
+        insertText(raw);
         renderPrompt();
       }
     }
   } finally {
     process.stdout.write(BPASTE_DISABLE);
-    process.stdin.setRawMode(false);
+    terminal.setRawMode(false);
     process.stdin.pause();
   }
 }
@@ -5422,7 +5406,7 @@ class SessionRunner {
     abortController.signal.addEventListener("abort", () => {
       wasAborted = true;
     });
-    const stopWatcher = watchForInterrupt(abortController);
+    const stopWatcher = watchForCancel(abortController);
     const { text: resolvedText, images: refImages } = await resolveFileRefs(text, this.cwd);
     const allImages = [...pastedImages, ...refImages];
     const thisTurn = this.turnIndex++;