@carboncode/cli 0.1.0 → 0.1.1

package/dist/index.js

@@ -33,35 +33,35 @@ function defineTheme(base) {
 }
 var githubDark = defineTheme({
   fg: {
-    strong: "#e6edf3",
-    body: "#c9d1d9",
-    sub: "#8b949e",
-    meta: "#6e7681",
-    faint: "#484f58"
+    strong: "#f8fafc",
+    body: "#e5e7eb",
+    sub: "#a1a1aa",
+    meta: "#71717a",
+    faint: "#52525b"
   },
   tone: {
-    brand: "#79c0ff",
-    accent: "#d2a8ff",
-    violet: "#b395f5",
-    ok: "#7ee787",
-    warn: "#f0b07d",
-    err: "#ff8b81",
-    info: "#79c0ff"
+    brand: "#f8fafc",
+    accent: "#a78bfa",
+    violet: "#c084fc",
+    ok: "#22c55e",
+    warn: "#eab308",
+    err: "#ef4444",
+    info: "#60a5fa"
   },
   toneActive: {
-    brand: "#a5d6ff",
-    accent: "#e2c5ff",
-    violet: "#c8aaff",
-    ok: "#a8f5ad",
-    warn: "#ffc99e",
-    err: "#ffaba3",
-    info: "#a5d6ff"
+    brand: "#ffffff",
+    accent: "#c4b5fd",
+    violet: "#d8b4fe",
+    ok: "#4ade80",
+    warn: "#facc15",
+    err: "#f87171",
+    info: "#93c5fd"
   },
   surface: {
-    bg: "#0a0c10",
-    bgInput: "#0d1015",
-    bgCode: "#06080c",
-    bgElev: "#11141a"
+    bg: "#09090b",
+    bgInput: "#111113",
+    bgCode: "#050507",
+    bgElev: "#18181b"
   }
 });
 var dark = defineTheme({
@@ -1139,13 +1139,16 @@ var EN = {
   },
   ui: {
     welcome: "Run `carboncode` any time to start chatting \u2014 your settings are remembered.",
-    taglineChat: "DeepSeek-native agent",
-    taglineCode: "DeepSeek-native coding agent",
-    taglineSub: "cache-first \xB7 flash-first",
-    startSessionHint: "type a message to start your session",
+    taglineChat: "terminal coding agent",
+    taglineCode: "terminal coding agent",
+    taglineSub: "read the repo, edit files, run validation",
+    startSessionHint: "type a task to start",
     inputPlaceholder: "Ask anything... (type / for commands, @ for files)",
     busy: "Thinking...",
     thinking: "\u25B8 thinking...",
+    activityWaitingForModel: "waiting for model\u2026",
+    activityThinking: "thinking\u2026",
+    activityProcessing: "processing\u2026",
     undo: "Undo",
     undoHint: "press u within 5s to undo",
     applied: "applied",
@@ -1623,6 +1626,7 @@ var EN = {
   app: {
     walkCancelledRemaining: "\u25B8 walk cancelled \u2014 {count} block(s) still pending.",
     walkCancelled: "\u25B8 walk cancelled.",
+    turnInterrupted: "\u25B8 turn interrupted \u2014 type a follow-up to continue.",
     editModeYolo: "\u25B8 edit mode: YOLO \u2014 edits AND shell commands auto-run. /undo still rolls back edits. Use carefully.",
     editModeAuto: "\u25B8 edit mode: AUTO \u2014 edits apply immediately; press u within 5s to undo (space pauses the timer). Shell commands still ask.",
     editModeReview: "\u25B8 edit mode: review \u2014 edits queue for /apply (or y) / /discard (or n)",
@@ -2103,10 +2107,13 @@ var EN = {
     queuedApplyDiscard: "{count} queued \xB7 y apply \xB7 n discard",
     editsQueued: "edits queued \xB7 y apply \xB7 n discard",
     shiftTabFlip: "   {mid} \xB7 Shift+Tab to flip",
-    queuedDots: "queued\u2026"
+    queuedDots: "queued\u2026",
+    undoApplied: "applied {ok}/{total}",
+    undoHint: "u undo \xB7 Space pause",
+    undoPausedHint: "u undo \xB7 Space resume"
   },
   composer: {
-    placeholder: "ask anything  \xB7  slash for commands  \xB7  at-sign for files",
+    placeholder: "Ask for a code change",
     waitingForResponse: "\u2026waiting for response\u2026",
     hintSend: "send",
     hintNewline: "newline",
@@ -2130,7 +2137,7 @@ var EN = {
     denyTitle: "Deny \u2014 provide context",
     optional: "optional",
     denyFooter: "type context  \xB7  \u23CE submit with reason  \xB7  esc skip (deny without reason)",
-    pickFooter: "\u2191\u2193 pick  \xB7  \u23CE confirm  \xB7  Tab add context  \xB7  esc cancel",
+    pickFooter: "\u2191\u2193 pick  \xB7  \u23CE confirm  \xB7  esc cancel",
     allowOnce: "allow once",
     allowOnceDesc: "permit this access; remember the directory for the rest of this session",
     allowAlways: "allow always",
@@ -2150,7 +2157,7 @@ var EN = {
     optional: "optional",
     denyFooter: "type context  \xB7  \u23CE submit with reason  \xB7  esc skip (deny without reason)",
     awaiting: "awaiting",
-    pickFooter: "\u2191\u2193 pick  \xB7  \u23CE confirm  \xB7  Tab add context  \xB7  esc cancel",
+    pickFooter: "\u2191\u2193 pick  \xB7  \u23CE confirm  \xB7  esc cancel",
     allowOnce: "allow once",
     allowOnceDesc: "run this command, ask again next time",
     allowAlways: "allow always",
@@ -2164,7 +2171,7 @@ var EN = {
     previewMorePlural: "\u2026 {n} more lines hidden \u2014 press esc, ask the model to split it"
   },
   editConfirm: {
-    footer: "[y/Enter] apply  \xB7  [n] reject with reason  \xB7  [a] apply rest  \xB7  [A] flip AUTO  \xB7  [\u2191\u2193/Space] scroll  \xB7  [Esc] abort",
+    footer: "Enter apply  \xB7  n reject  \xB7  \u2191\u2193 scroll  \xB7  Esc cancel",
     newTag: "NEW",
     editTag: "EDIT",
     linesCount: "-{removed} +{added} lines",
@@ -2583,13 +2590,16 @@ var zhCN = {
   },
   ui: {
     welcome: "\u968F\u65F6\u8FD0\u884C `carboncode` \u5F00\u59CB\u804A\u5929 \u2014 \u60A8\u7684\u8BBE\u7F6E\u5C06\u88AB\u8BB0\u4F4F\u3002",
-    taglineChat: "DeepSeek \u539F\u751F\u667A\u80FD\u4F53",
-    taglineCode: "DeepSeek \u539F\u751F\u4EE3\u7801\u667A\u80FD\u4F53",
-    taglineSub: "\u7F13\u5B58\u4F18\u5148 \xB7 Flash \u4F18\u5148",
-    startSessionHint: "\u8F93\u5165\u6D88\u606F\u4EE5\u5F00\u59CB\u60A8\u7684\u4F1A\u8BDD",
+    taglineChat: "\u7EC8\u7AEF\u4EE3\u7801\u667A\u80FD\u4F53",
+    taglineCode: "\u7EC8\u7AEF\u4EE3\u7801\u667A\u80FD\u4F53",
+    taglineSub: "\u8BFB\u53D6\u4ED3\u5E93\u3001\u7F16\u8F91\u6587\u4EF6\u3001\u8FD0\u884C\u9A8C\u8BC1",
+    startSessionHint: "\u8F93\u5165\u4EFB\u52A1\u5F00\u59CB",
     inputPlaceholder: "\u8F93\u5165\u4EFB\u4F55\u5185\u5BB9... (\u8F93\u5165 / \u4F7F\u7528\u547D\u4EE4, @ \u5F15\u7528\u6587\u4EF6)",
     busy: "\u601D\u8003\u4E2D...",
     thinking: "\u25B8 \u601D\u8003\u4E2D...",
+    activityWaitingForModel: "\u7B49\u5F85\u6A21\u578B\u2026",
+    activityThinking: "\u601D\u8003\u4E2D\u2026",
+    activityProcessing: "\u5904\u7406\u4E2D\u2026",
     undo: "\u64A4\u6D88",
     undoHint: "\u5728 5 \u79D2\u5185\u6309 u \u64A4\u6D88",
     applied: "\u5DF2\u5E94\u7528",
@@ -3068,6 +3078,7 @@ var zhCN = {
   app: {
     walkCancelledRemaining: "\u25B8 \u6D4F\u89C8\u5DF2\u53D6\u6D88 \u2014 \u8FD8\u6709 {count} \u4E2A\u5F85\u5904\u7406\u7F16\u8F91\u5757\u3002",
     walkCancelled: "\u25B8 \u6D4F\u89C8\u5DF2\u53D6\u6D88\u3002",
+    turnInterrupted: "\u25B8 \u672C\u8F6E\u5DF2\u4E2D\u65AD \u2014 \u8F93\u5165\u540E\u7EED\u5185\u5BB9\u53EF\u7EE7\u7EED\u3002",
     editModeYolo: "\u25B8 \u7F16\u8F91\u6A21\u5F0F\uFF1AYOLO \u2014 \u7F16\u8F91\u548C shell \u547D\u4EE4\u90FD\u81EA\u52A8\u6267\u884C\u3002/undo \u4ECD\u53EF\u64A4\u9500\u7F16\u8F91\u3002\u8BF7\u8C28\u614E\u4F7F\u7528\u3002",
     editModeAuto: "\u25B8 \u7F16\u8F91\u6A21\u5F0F\uFF1AAUTO \u2014 \u7F16\u8F91\u7ACB\u5373\u5E94\u7528\uFF1B5 \u79D2\u5185\u6309 u \u64A4\u9500\uFF08\u7A7A\u683C\u6682\u505C\u8BA1\u65F6\uFF09\u3002shell \u547D\u4EE4\u4ECD\u4F1A\u8BE2\u95EE\u3002",
     editModeReview: "\u25B8 \u7F16\u8F91\u6A21\u5F0F\uFF1Areview \u2014 \u7F16\u8F91\u5165\u961F\u5F85 /apply\uFF08\u6216 y\uFF09/ /discard\uFF08\u6216 n\uFF09",
@@ -3548,10 +3559,13 @@ var zhCN = {
     queuedApplyDiscard: "{count} \u4E2A\u5F85\u5904\u7406 \xB7 y \u5E94\u7528 \xB7 n \u4E22\u5F03",
     editsQueued: "\u7F16\u8F91\u5DF2\u6392\u961F \xB7 y \u5E94\u7528 \xB7 n \u4E22\u5F03",
     shiftTabFlip: "   {mid} \xB7 Shift+Tab \u5207\u6362",
-    queuedDots: "\u6392\u961F\u4E2D\u2026"
+    queuedDots: "\u6392\u961F\u4E2D\u2026",
+    undoApplied: "\u5DF2\u5E94\u7528 {ok}/{total}",
+    undoHint: "u \u64A4\u6D88 \xB7 Space \u6682\u505C",
+    undoPausedHint: "u \u64A4\u6D88 \xB7 Space \u7EE7\u7EED"
   },
   composer: {
-    placeholder: "\u8F93\u5165\u4EFB\u4F55\u5185\u5BB9  \xB7  / \u4F7F\u7528\u547D\u4EE4  \xB7  @ \u5F15\u7528\u6587\u4EF6",
+    placeholder: "\u8F93\u5165\u4EFB\u52A1",
     waitingForResponse: "\u2026\u7B49\u5F85\u54CD\u5E94\u2026",
     hintSend: "\u53D1\u9001",
     hintNewline: "\u6362\u884C",
@@ -3575,7 +3589,7 @@ var zhCN = {
     denyTitle: "\u62D2\u7EDD \u2014 \u63D0\u4F9B\u539F\u56E0",
     optional: "\u53EF\u9009",
     denyFooter: "\u8F93\u5165\u539F\u56E0 \xB7 \u23CE \u63D0\u4EA4 \xB7 Esc \u8DF3\u8FC7\uFF08\u76F4\u63A5\u62D2\u7EDD\uFF09",
-    pickFooter: "\u2191\u2193 \u9009\u62E9 \xB7 \u23CE \u786E\u8BA4 \xB7 Tab \u6DFB\u52A0\u8BF4\u660E \xB7 Esc \u53D6\u6D88",
+    pickFooter: "\u2191\u2193 \u9009\u62E9 \xB7 \u23CE \u786E\u8BA4 \xB7 Esc \u53D6\u6D88",
     allowOnce: "\u5141\u8BB8\u4E00\u6B21",
     allowOnceDesc: "\u672C\u6B21\u5141\u8BB8\uFF0C\u672C\u4F1A\u8BDD\u5185\u6B64\u76EE\u5F55\u4E0D\u518D\u8BE2\u95EE",
     allowAlways: "\u59CB\u7EC8\u5141\u8BB8",
@@ -3595,7 +3609,7 @@ var zhCN = {
     optional: "\u53EF\u9009",
     denyFooter: "\u8F93\u5165\u539F\u56E0 \xB7 \u23CE \u63D0\u4EA4 \xB7 Esc \u8DF3\u8FC7\uFF08\u76F4\u63A5\u62D2\u7EDD\uFF09",
     awaiting: "\u7B49\u5F85\u4E2D",
-    pickFooter: "\u2191\u2193 \u9009\u62E9 \xB7 \u23CE \u786E\u8BA4 \xB7 Tab \u6DFB\u52A0\u8BF4\u660E \xB7 Esc \u53D6\u6D88",
+    pickFooter: "\u2191\u2193 \u9009\u62E9 \xB7 \u23CE \u786E\u8BA4 \xB7 Esc \u53D6\u6D88",
     allowOnce: "\u5141\u8BB8\u4E00\u6B21",
     allowOnceDesc: "\u6267\u884C\u6B64\u547D\u4EE4\uFF0C\u4E0B\u6B21\u518D\u95EE",
     allowAlways: "\u59CB\u7EC8\u5141\u8BB8",
@@ -3609,7 +3623,7 @@ var zhCN = {
     previewMorePlural: "\u2026 \u8FD8\u6709 {n} \u884C\u672A\u663E\u793A \u2014 \u6309 esc \u53D6\u6D88\uFF0C\u8BA9\u6A21\u578B\u62C6\u5206\u540E\u518D\u8BD5"
   },
   editConfirm: {
-    footer: "[y/Enter] \u5E94\u7528 \xB7 [n] \u62D2\u7EDD\u5E76\u8BF4\u660E \xB7 [a] \u5E94\u7528\u5269\u4F59 \xB7 [A] \u5207\u6362 AUTO \xB7 [\u2191\u2193/Space] \u6EDA\u52A8 \xB7 [Esc] \u4E2D\u6B62",
+    footer: "Enter \u5E94\u7528 \xB7 n \u62D2\u7EDD \xB7 \u2191\u2193 \u6EDA\u52A8 \xB7 Esc \u53D6\u6D88",
     newTag: "\u65B0\u589E",
     editTag: "\u7F16\u8F91",
     linesCount: "-{removed} +{added} \u884C",
@@ -4785,9 +4799,14 @@ var ToolRegistry = class {
         rejectedReason: "plan-mode"
       });
     }
+    const dispatchCtx = {
+      signal: opts.signal,
+      confirmationGate: opts.confirmationGate,
+      onInteractiveWait: opts.onInteractiveWait
+    };
     if (this._interceptor) {
       try {
-        const short = await this._interceptor(name, args);
+        const short = await this._interceptor(name, args, dispatchCtx);
         if (typeof short === "string") return short;
       } catch (err) {
         return JSON.stringify({
@@ -4801,10 +4820,7 @@ var ToolRegistry = class {
         this._auditListener?.({ name, args });
       } catch {
       }
-      const result = await tool.fn(args, {
-        signal: opts.signal,
-        confirmationGate: opts.confirmationGate
-      });
+      const result = await tool.fn(args, dispatchCtx);
       const str = typeof result === "string" ? result : JSON.stringify(result);
       let clipped = str;
       if (opts.maxResultTokens !== void 0) {
@@ -6834,6 +6850,8 @@ var CacheFirstLoop = class {
     const name = call.function?.name ?? "";
     const args = call.function?.arguments ?? "{}";
     const parsedArgs = safeParseToolArgs(args);
+    const startedAt = Date.now();
+    let interactiveWaitMs = 0;
     this._inflight.add(this.inflightIdFor(call));
     try {
       const preReport = await runHooks({
@@ -6853,13 +6871,17 @@ var CacheFirstLoop = class {
           preWarnings,
           postWarnings: [],
           result: `[hook block] ${blocking?.hook.command ?? "<unknown>"}
-${reason}`
+${reason}`,
+          elapsedMs: Date.now() - startedAt
         };
       }
       const result = await this.tools.dispatch(name, args, {
         signal,
         maxResultTokens: DEFAULT_MAX_RESULT_TOKENS,
-        confirmationGate: this.confirmationGate
+        confirmationGate: this.confirmationGate,
+        onInteractiveWait: (elapsedMs) => {
+          interactiveWaitMs += Math.max(0, elapsedMs);
+        }
       });
       const postReport = await runHooks({
         hooks: this.hooks,
@@ -6872,7 +6894,12 @@ ${reason}`
         }
       });
       const postWarnings = [...hookWarnings(postReport.outcomes, this._turn)];
-      return { preWarnings, postWarnings, result };
+      return {
+        preWarnings,
+        postWarnings,
+        result,
+        elapsedMs: Math.max(0, Date.now() - startedAt - interactiveWaitMs)
+      };
     } finally {
       this._inflight.delete(this.inflightIdFor(call));
     }
@@ -7357,12 +7384,14 @@ ${reason}`
           const args = call.function?.arguments ?? "{}";
           const s = settled[k];
           let result;
+          let elapsedMs = 0;
           let preWarnings = [];
           let postWarnings = [];
           if (s.status === "fulfilled") {
             preWarnings = s.value.preWarnings;
             postWarnings = s.value.postWarnings;
             result = s.value.result;
+            elapsedMs = s.value.elapsedMs;
           } else {
             const err = s.reason instanceof Error ? s.reason : new Error(String(s.reason));
             result = JSON.stringify({ error: `${err.name}: ${err.message}` });
@@ -7381,7 +7410,8 @@ ${reason}`
             content: result,
             toolName: name,
             toolArgs: args,
-            callId: this.inflightIdFor(call)
+            callId: this.inflightIdFor(call),
+            elapsedMs
           };
         }
       }
@@ -8931,27 +8961,51 @@ async function applyMultiEdit(rootDir, edits) {
       );
     }
     const rel = displayRel(rootDir, e.abs);
-    if (e.search.length === 0) {
-      throw new Error(
-        `multi_edit: edit #${i + 1} (${rel}) search cannot be empty (no edits applied)`
-      );
-    }
     let state = filesByPath.get(e.abs);
     if (!state) {
       let before;
-      try {
-        before = await fs.readFile(e.abs, "utf8");
-      } catch (err) {
-        throw new Error(
-          `multi_edit: edit #${i + 1} cannot read ${rel}: ${err.message} (no edits applied)`
-        );
+      if (e.search.length === 0) {
+        try {
+          await fs.readFile(e.abs, "utf8");
+          throw new Error("empty SEARCH only creates new files \u2014 this file already exists");
+        } catch (err) {
+          const code = err.code;
+          if (code !== "ENOENT") {
+            throw new Error(
+              `multi_edit: edit #${i + 1} cannot create ${rel}: ${err.message} (no edits applied)`
+            );
+          }
+        }
+        state = { buf: "", le: "\n", hunks: [], deltaChars: 0, touched: 0, created: true };
+        filesByPath.set(e.abs, state);
+      } else {
+        try {
+          before = await fs.readFile(e.abs, "utf8");
+        } catch (err) {
+          throw new Error(
+            `multi_edit: edit #${i + 1} cannot read ${rel}: ${err.message} (no edits applied)`
+          );
+        }
+        const le = before.includes("\r\n") ? "\r\n" : "\n";
+        state = { buf: before, le, hunks: [], deltaChars: 0, touched: 0, created: false };
+        filesByPath.set(e.abs, state);
       }
-      const le = before.includes("\r\n") ? "\r\n" : "\n";
-      state = { buf: before, le, hunks: [], deltaChars: 0, touched: 0 };
-      filesByPath.set(e.abs, state);
+    }
+    if (e.search.length === 0 && (!state.created || state.touched > 0)) {
+      throw new Error(
+        `multi_edit: edit #${i + 1} (${rel}) empty search only creates new files (no edits applied)`
+      );
     }
     const adaptedSearch = e.search.replace(/\r?\n/g, state.le);
     const adaptedReplace = e.replace.replace(/\r?\n/g, state.le);
+    if (adaptedSearch.length === 0) {
+      state.buf = adaptedReplace;
+      state.hunks.push(`# ${rel}
+${renderCreateDiff(adaptedReplace)}`);
+      state.deltaChars += adaptedReplace.length;
+      state.touched++;
+      continue;
+    }
     const firstIdx = state.buf.indexOf(adaptedSearch);
     if (firstIdx < 0) {
       throw new Error(
@@ -8972,6 +9026,7 @@ ${renderEditDiff(adaptedSearch, adaptedReplace, startLine)}`);
     state.touched++;
   }
   for (const [abs, state] of filesByPath) {
+    if (state.created) await fs.mkdir(pathMod.dirname(abs), { recursive: true });
     await fs.writeFile(abs, state.buf, "utf8");
   }
   const fileCount = filesByPath.size;
@@ -8998,6 +9053,13 @@ function renderEditDiff(search, replace, startLine) {
   return `${hunk}
 ${body}`;
 }
+function renderCreateDiff(replace) {
+  const lines = replace.length === 0 ? [] : replace.split(/\r?\n/);
+  const hunk = `@@ -1,0 +1,${lines.length} @@`;
+  const body = lines.map((line) => `+ ${line}`).join("\n");
+  return body ? `${hunk}
+${body}` : hunk;
+}
 function lineDiff(a, b) {
   const n = a.length;
   const m = b.length;
@@ -9281,6 +9343,110 @@ function formatOutline(entries) {
   ].join("\n");
 }
 
+// src/tools/fs/patch.ts
+function parseUnifiedPatch(patch) {
+  if (typeof patch !== "string" || patch.trim().length === 0) {
+    throw new Error("apply_patch: patch must be a non-empty string");
+  }
+  const lines = patch.split(/\n/);
+  const files = [];
+  let current = null;
+  const ensureCurrent = () => {
+    if (!current) {
+      current = { oldPath: null, newPath: null, blocks: [] };
+      files.push(current);
+    }
+    return current;
+  };
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.startsWith("diff --git ")) {
+      current = { oldPath: null, newPath: null, blocks: [] };
+      files.push(current);
+      i++;
+      continue;
+    }
+    if (line.startsWith("--- ")) {
+      ensureCurrent().oldPath = parsePatchPath(line.slice(4));
+      i++;
+      continue;
+    }
+    if (line.startsWith("+++ ")) {
+      ensureCurrent().newPath = parsePatchPath(line.slice(4));
+      i++;
+      continue;
+    }
+    if (line.startsWith("@@")) {
+      const file = ensureCurrent();
+      const path2 = file.newPath ?? file.oldPath;
+      if (!path2) throw new Error("apply_patch: hunk is missing a file path");
+      const searchLines = [];
+      const replaceLines = [];
+      i++;
+      while (i < lines.length) {
+        const hunkLine = lines[i];
+        if (hunkLine.startsWith("diff --git ") || hunkLine.startsWith("@@") || hunkLine.startsWith("--- ")) {
+          break;
+        }
+        if (hunkLine === "" && i === lines.length - 1) {
+          break;
+        }
+        if (hunkLine.startsWith("\")) {
+          i++;
+          continue;
+        }
+        const marker = hunkLine[0];
+        const body = hunkLine.slice(1);
+        if (marker === " ") {
+          searchLines.push(body);
+          replaceLines.push(body);
+        } else if (marker === "-") {
+          searchLines.push(body);
+        } else if (marker === "+") {
+          replaceLines.push(body);
+        } else if (hunkLine.trim().length === 0) {
+        } else {
+          throw new Error(`apply_patch: invalid hunk line: ${hunkLine}`);
+        }
+        i++;
+      }
+      file.blocks.push({
+        path: path2,
+        search: file.oldPath === null ? "" : linesToText(searchLines),
+        replace: linesToText(replaceLines),
+        offset: 0
+      });
+      continue;
+    }
+    i++;
+  }
+  const blocks = files.flatMap((file) => file.blocks);
+  if (blocks.length === 0) throw new Error("apply_patch: patch did not contain any hunks");
+  return blocks;
+}
+function linesToText(lines) {
+  if (lines.length === 0) return "";
+  return `${lines.join("\n")}
+`;
+}
+function parsePatchPath(raw) {
+  const cleaned = unquotePath(raw.trim().split(/\t/, 1)[0] ?? "");
+  if (cleaned === "/dev/null") return null;
+  const withoutPrefix = cleaned.replace(/^[ab]\//, "");
+  const normalized = withoutPrefix.replace(/^[/\\]+/, "");
+  if (!normalized) throw new Error(`apply_patch: invalid patch path: ${raw}`);
+  return normalized.replaceAll("\\", "/");
+}
+function unquotePath(path2) {
+  if (path2.length < 2 || !path2.startsWith('"') || !path2.endsWith('"')) return path2;
+  try {
+    return JSON.parse(path2);
+  } catch {
+    return path2.slice(1, -1);
+  }
+}
+
 // src/tools/fs/search.ts
 import { promises as fs3 } from "fs";
 import * as pathMod4 from "path";
@@ -9578,10 +9744,14 @@ ${body}`;
     let pending = inflightGate.get(allowPrefix);
     if (!pending) {
       const gate = ctx?.confirmationGate ?? pauseGate;
+      const waitStartedAt = Date.now();
       pending = gate.ask({
         kind: "path_access",
         payload: { path: abs, intent, toolName, sandboxRoot: normRoot, allowPrefix }
       });
+      pending = pending.finally(() => {
+        ctx?.onInteractiveWait?.(Date.now() - waitStartedAt);
+      });
       inflightGate.set(allowPrefix, pending);
       void pending.finally(() => inflightGate.delete(allowPrefix));
     }
@@ -10001,7 +10171,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
   });
   registry.register({
     name: "multi_edit",
-    description: "Apply N SEARCH/REPLACE edits across ONE OR MORE files in a single atomic call. Edits run sequentially in array order; for edits that touch the same file, a later edit can match text inserted by an earlier one. If ANY edit fails (search not found, ambiguous match, empty search, file unreadable), NO files are written \u2014 atomic at the validation layer. Same per-edit rules as edit_file: `search` is exact text (whitespace sensitive, no regex) and must be unique in its target file at the moment that edit applies. Use this for renames spanning multiple files, cross-file refactors, or any batch where you'd otherwise loop edit_file.",
+    description: "Apply N SEARCH/REPLACE edits across ONE OR MORE files in a single atomic call. Edits run sequentially in array order; for edits that touch the same file, a later edit can match text inserted by an earlier one. If ANY edit fails (search not found, ambiguous match, file unreadable, invalid create), NO files are written \u2014 atomic at the validation layer. Same per-edit rules as edit_file: `search` is exact text (whitespace sensitive, no regex) and must be unique in its target file at the moment that edit applies. To create a new file, use an empty `search`; empty `search` is refused for existing files. Use this for renames spanning multiple files, cross-file refactors, or any batch where you'd otherwise loop edit_file.",
     parameters: {
       type: "object",
       properties: {
@@ -10038,6 +10208,41 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
       return applyMultiEdit(rootDir, resolved);
     }
   });
+  registry.register({
+    name: "apply_patch",
+    description: "Apply a unified git-style patch atomically under the sandbox root. Use this for non-trivial code edits because it lets the UI review the whole patch as one batch. If any hunk fails, no files are written.",
+    parameters: {
+      type: "object",
+      properties: {
+        patch: {
+          type: "string",
+          description: "Unified diff text with diff --git / --- / +++ headers and @@ hunks. Paths should be project-relative or a/ b/-prefixed."
+        }
+      },
+      required: ["patch"]
+    },
+    fn: async (args, ctx) => {
+      try {
+        const blocks = parseUnifiedPatch(args.patch);
+        const resolved = await Promise.all(
+          blocks.map(async (block) => ({
+            abs: await safePath(block.path, "apply_patch", ctx, "write"),
+            search: block.search,
+            replace: block.replace,
+            rel: block.path,
+            created: block.search.length === 0
+          }))
+        );
+        const output = await applyMultiEdit(rootDir, resolved);
+        const fileCount = new Set(resolved.map((edit) => edit.rel)).size;
+        const fileNoun = fileCount === 1 ? "file" : "files";
+        const created = resolved.filter((edit) => edit.created).map((edit) => `created ${edit.rel}`);
+        return [`apply_patch: applied ${fileCount} ${fileNoun}`, ...created, output].join("\n");
+      } catch (err) {
+        return `apply_patch: no files written \u2014 ${err.message}`;
+      }
+    }
+  });
   registry.register({
     name: "create_directory",
     description: "Create a directory (and any missing parents) under the sandbox root.",
@@ -12269,7 +12474,7 @@ function hasSensitivePathArgs(argv, projectRoot, extraPrefixes = [], extraPatter
   }
   return false;
 }
-function isAllowed(cmd, extra = [], projectRoot, sensitivePathConfig) {
+function isAllowed(cmd, extra = [], projectRoot, sensitivePathConfig, opts = {}) {
   let argv;
   try {
     argv = tokenizeCommand(cmd);
@@ -12277,7 +12482,7 @@ function isAllowed(cmd, extra = [], projectRoot, sensitivePathConfig) {
     return false;
   }
   if (argv.length === 0) return false;
-  const allowlist = [...BUILTIN_ALLOWLIST, ...extra];
+  const allowlist = [...opts.includeBuiltin === false ? [] : BUILTIN_ALLOWLIST, ...extra];
   for (const prefix of allowlist) {
     const prefixTokens = prefix.split(" ");
     if (argv.length < prefixTokens.length) continue;
@@ -12302,15 +12507,18 @@ function isAllowed(cmd, extra = [], projectRoot, sensitivePathConfig) {
   }
   return false;
 }
-function isCommandAllowed(cmd, extra = [], projectRoot, sensitivePathConfig) {
+function isCommandAllowed(cmd, extra = [], projectRoot, sensitivePathConfig, opts = {}) {
   let chain;
   try {
     chain = parseCommandChain(cmd);
   } catch {
     return false;
   }
-  if (chain === null) return isAllowed(cmd, extra, projectRoot, sensitivePathConfig);
-  return chainAllowed(chain, (seg) => isAllowed(seg, extra, projectRoot, sensitivePathConfig));
+  if (chain === null) return isAllowed(cmd, extra, projectRoot, sensitivePathConfig, opts);
+  return chainAllowed(
+    chain,
+    (seg) => isAllowed(seg, extra, projectRoot, sensitivePathConfig, opts)
+  );
 }
 
 // src/tools/shell/exec.ts
@@ -12610,9 +12818,19 @@ function registerShellTools(registry, opts) {
     return () => snapshot2;
   })();
   const isAllowAll = typeof opts.allowAll === "function" ? opts.allowAll : () => opts.allowAll === true;
+  const isAutoAllowed = (cmd) => isCommandAllowed(cmd, getExtraAllowed(), rootDir, opts.sensitivePaths, {
+    includeBuiltin: opts.requireApprovalForBuiltin !== true
+  });
+  const approvalPolicy = opts.requireApprovalForBuiltin ? "Model-requested shell commands ask the user before they run unless the user has explicitly always-allowed a project prefix or yolo mode is active. Prefer this over asking the user to run a command manually \u2014 after edits, run the project's tests to verify." : "Allowlisted read-only / test / lint / typecheck commands run immediately; anything that could mutate state, install deps, or touch the network is gated by user confirmation. Prefer this over asking the user to run a command manually \u2014 after edits, run the project's tests to verify.";
   registry.register({
     name: "run_command",
-    description: "Run a shell command in the project root; returns combined stdout+stderr. Allowlisted read-only / test / lint / typecheck commands run immediately; anything that could mutate state, install deps, or touch the network is gated by user confirmation. Prefer this over asking the user to run a command manually \u2014 after edits, run the project's tests to verify.\n\nConstraints (no real shell \u2014 argv is parsed natively for cross-platform parity):\n\u2022 Supported: chain ops `|` / `||` / `&&` / `;` (each segment allowlist-checked individually), file redirects `>` / `>>` / `<` / `2>` / `2>>` / `2>&1` / `&>` (target paths resolve relative to project root, max one redirect per fd per segment).\n\u2022 NOT supported: background `&`, heredoc `<<`, command substitution `$(\u2026)`, subshells `(\u2026)`, process substitution `<(\u2026)`, `$VAR` env expansion, glob expansion. To pass an operator char as literal arg, quote it (`grep \"a|b\" file`).\n\u2022 `cd` does NOT persist \u2014 between calls OR within a chain like `cd dir && cmd`. Use the binary's own cwd flag: `npm --prefix <dir>`, `git -C <dir>`, `cargo -C <dir>`, `pytest <dir>/tests`.\n\u2022 Filter at source \u2014 unbounded output (`netstat -ano`, `find /`) wastes tokens. Use `grep -c`, `wc -l`, narrower paths, etc.",
+    description: `Run a shell command in the project root; returns combined stdout+stderr. ${approvalPolicy}
+
+Constraints (no real shell \u2014 argv is parsed natively for cross-platform parity):
+\u2022 Supported: chain ops \`|\` / \`||\` / \`&&\` / \`;\` (each segment allowlist-checked individually), file redirects \`>\` / \`>>\` / \`<\` / \`2>\` / \`2>>\` / \`2>&1\` / \`&>\` (target paths resolve relative to project root, max one redirect per fd per segment).
+\u2022 NOT supported: background \`&\`, heredoc \`<<\`, command substitution \`$(\u2026)\`, subshells \`(\u2026)\`, process substitution \`<(\u2026)\`, \`$VAR\` env expansion, glob expansion. To pass an operator char as literal arg, quote it (\`grep "a|b" file\`).
+\u2022 \`cd\` does NOT persist \u2014 between calls OR within a chain like \`cd dir && cmd\`. Use the binary's own cwd flag: \`npm --prefix <dir>\`, \`git -C <dir>\`, \`cargo -C <dir>\`, \`pytest <dir>/tests\`.
+\u2022 Filter at source \u2014 unbounded output (\`netstat -ano\`, \`find /\`) wastes tokens. Use \`grep -c\`, \`wc -l\`, narrower paths, etc.`,
     // Plan-mode gate: allow allowlisted commands through (git status,
     // cargo check, ls, grep …) so the model can actually investigate
     // during planning. Anything that would otherwise trigger a
@@ -12641,12 +12859,14 @@ function registerShellTools(registry, opts) {
       const cmd = args.command.trim();
       if (!cmd) throw new Error("run_command: empty command");
       const effectiveTimeout = Math.max(1, Math.min(600, args.timeoutSec ?? timeoutSec));
-      if (!isAllowAll() && !isCommandAllowed(cmd, getExtraAllowed(), rootDir, opts.sensitivePaths)) {
+      if (!isAllowAll() && !isAutoAllowed(cmd)) {
         const gate = ctx?.confirmationGate ?? pauseGate;
+        const waitStartedAt = Date.now();
         const choice = await gate.ask({
           kind: "run_command",
           payload: { command: cmd, cwd: rootDir, timeoutSec: effectiveTimeout }
         });
+        ctx?.onInteractiveWait?.(Date.now() - waitStartedAt);
         if (choice.type === "deny") {
           throw new Error(
             `user denied: ${cmd}${choice.denyContext ? ` \u2014 ${choice.denyContext}` : ""}`
@@ -12690,12 +12910,14 @@ function registerShellTools(registry, opts) {
       const cmd = args.command.trim();
       if (!cmd) throw new Error("run_background: empty command");
       const cwd = resolveCwdInsideRoot(rootDir, args.cwd);
-      if (!isAllowAll() && !isCommandAllowed(cmd, getExtraAllowed(), rootDir, opts.sensitivePaths)) {
+      if (!isAllowAll() && !isAutoAllowed(cmd)) {
         const gate = ctx?.confirmationGate ?? pauseGate;
+        const waitStartedAt = Date.now();
         const choice = await gate.ask({
           kind: "run_background",
           payload: { command: cmd, cwd, waitSec: args.waitSec }
         });
+        ctx?.onInteractiveWait?.(Date.now() - waitStartedAt);
         if (choice.type === "deny") {
           throw new Error(
             `user denied: ${cmd}${choice.denyContext ? ` \u2014 ${choice.denyContext}` : ""}`
@@ -13766,14 +13988,14 @@ function truncate(s, n) {
 // src/version.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync5, readFileSync as readFileSync13, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir7 } from "os";
-import { dirname as dirname7, join as join14 } from "path";
+import { dirname as dirname8, join as join14 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var REGISTRY_URL = "https://registry.npmjs.org/@carboncode/cli/latest";
 var LATEST_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var LATEST_FETCH_TIMEOUT_MS = 2e3;
 function readPackageVersion() {
   try {
-    let dir = dirname7(fileURLToPath2(import.meta.url));
+    let dir = dirname8(fileURLToPath2(import.meta.url));
     for (let i = 0; i < 6; i++) {
       const p = join14(dir, "package.json");
       if (existsSync10(p)) {
@@ -13782,7 +14004,7 @@ function readPackageVersion() {
           return pkg.version;
         }
       }
-      const parent = dirname7(dir);
+      const parent = dirname8(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -13808,7 +14030,7 @@ function readCache(homeDirOverride) {
 function writeCache(entry, homeDirOverride) {
   try {
     const p = cachePath(homeDirOverride);
-    mkdirSync5(dirname7(p), { recursive: true });
+    mkdirSync5(dirname8(p), { recursive: true });
     writeFileSync5(p, JSON.stringify(entry), "utf8");
   } catch {
   }
@@ -14578,7 +14800,7 @@ import {
   writeFileSync as writeFileSync6,
   writeSync
 } from "fs";
-import { dirname as dirname8, resolve as resolve12 } from "path";
+import { dirname as dirname9, resolve as resolve12 } from "path";
 var BLOCK_RE = /^(\S[^\n]*)\n<{7} SEARCH\n([\s\S]*?)\n?={7}\n([\s\S]*?)\n?>{7} REPLACE/gm;
 function parseEditBlocks(text) {
   const out = [];
@@ -14608,7 +14830,7 @@ function applyEditBlock(block, rootDir) {
   const searchEmpty = block.search.length === 0;
   if (searchEmpty) {
     try {
-      mkdirSync6(dirname8(absTarget), { recursive: true });
+      mkdirSync6(dirname9(absTarget), { recursive: true });
       const fd = openSync2(absTarget, "wx");
       try {
         writeSync(fd, block.replace);
@@ -14748,7 +14970,7 @@ var DEFAULT_CODE_MODEL = "deepseek-v4-flash";
 function codeSystemBase(modelId) {
   return CODE_SYSTEM_TEMPLATE.replace("__ESCALATION_CONTRACT__", escalationContract(modelId));
 }
-var CODE_SYSTEM_TEMPLATE = `You are Carbon Code, a coding assistant. You have filesystem tools (read_file, write_file, edit_file, multi_edit, list_directory, directory_tree, search_files, search_content, glob, get_file_info) rooted at the user's working directory, plus run_command / run_background for shell, plus \`todo_write\` for in-session multi-step tracking.
+var CODE_SYSTEM_TEMPLATE = `You are Carbon Code, a coding assistant. You have filesystem tools (read_file, write_file, edit_file, multi_edit, apply_patch, list_directory, directory_tree, search_files, search_content, glob, get_file_info) rooted at the user's working directory, plus run_command / run_background for shell, plus \`todo_write\` for in-session multi-step tracking.
 
 # Identity is fixed by this prompt \u2014 never inferred from the workspace
 
@@ -14831,8 +15053,8 @@ Call shape: \`{ todos: [{ content, activeForm, status }, ...] }\` \u2014 \`conte
 # Plan mode (/plan)
 
 The user can ALSO enter "plan mode" via /plan, which is a stronger, explicit constraint:
-- Write tools (edit_file, multi_edit, write_file, create_directory, move_file, copy_file, delete_file, delete_directory) and non-allowlisted run_command calls are BOUNCED at dispatch \u2014 you'll get a tool result like "unavailable in plan mode". Don't retry them.
-- Read tools (read_file, list_directory, search_files, directory_tree, get_file_info) and allowlisted read-only / test shell commands still work \u2014 use them to investigate.
+- Write tools (edit_file, multi_edit, apply_patch, write_file, create_directory, move_file, copy_file, delete_file, delete_directory) and non-allowlisted run_command calls are BOUNCED at dispatch \u2014 you'll get a tool result like "unavailable in plan mode". Don't retry them.
+- Read tools (read_file, list_directory, search_files, directory_tree, get_file_info) and allowlisted read-only / test shell commands still work after user approval \u2014 use them to investigate.
 - You MUST call submit_plan before anything will execute. Approve exits plan mode; Refine stays in; Cancel exits without implementing.
 
 
@@ -14874,8 +15096,8 @@ When you do propose edits, the user will review them and decide whether to \`/ap
 
 Carbon Code runs an **edit gate**. The user's current mode (\`review\` or \`auto\`) decides what happens to your writes; you DO NOT see which mode is active, and you SHOULD NOT ask. Write the same way in both cases.
 
-- In \`auto\` mode \`edit_file\` / \`write_file\` calls land on disk immediately with an undo window \u2014 you'll get the normal "edit blocks: 1/1 applied" style response.
-- In \`review\` mode EACH \`edit_file\` / \`write_file\` call pauses tool dispatch while the user decides. You'll get one of these responses:
+- In \`auto\` mode \`edit_file\` / \`write_file\` / \`multi_edit\` / \`apply_patch\` calls land on disk immediately with an undo window \u2014 you'll get the normal applied-edit response.
+- In \`review\` mode EACH \`edit_file\` / \`write_file\` / \`multi_edit\` / \`apply_patch\` call pauses tool dispatch while the user decides. You'll get one of these responses:
   - \`"edit blocks: 1/1 applied"\` \u2014 user approved it. Continue as normal.
   - \`"User rejected this edit to <path>. Don't retry the same SEARCH/REPLACE\u2026"\` \u2014 user said no to THIS specific edit. Do NOT re-emit the same block, do NOT switch tools to sneak it past the gate (write_file \u2192 edit_file, or text-form SEARCH/REPLACE). Either take a clearly different approach or stop and ask the user what they want instead.
   - Text-form SEARCH/REPLACE blocks in your assistant reply queue for end-of-turn /apply \u2014 same "don't retry on rejection" rule.
@@ -14883,7 +15105,20 @@ Carbon Code runs an **edit gate**. The user's current mode (\`review\` or \`auto
 
 # Editing files
 
-When you've been asked to change a file, output one or more SEARCH/REPLACE blocks in this exact format:
+Default loop: inspect, patch, verify, summarize. After tests pass, summarize briefly and cite the files or commands that matter.
+
+When you've been asked to change a file, prefer \`apply_patch\` for non-trivial edits. It accepts a unified git-style patch and lets the user review the whole batch at once:
+
+\`\`\`diff
+diff --git a/path/to/file.ext b/path/to/file.ext
+--- a/path/to/file.ext
++++ b/path/to/file.ext
+@@ -1 +1 @@
+-old line
++new line
+\`\`\`
+
+For tiny exact replacements, \`edit_file\` is fine. For generated programmatic batches, \`multi_edit\` is also fine. If you are writing text-form edits in your final answer instead of calling tools, output one or more SEARCH/REPLACE blocks in this exact format:
 
 path/to/file.ext
 <<<<<<< SEARCH
@@ -14903,7 +15138,7 @@ Rules:
     >>>>>>> REPLACE
 - Do NOT use write_file to change existing files \u2014 the user reviews your edits as SEARCH/REPLACE. write_file is only for files you explicitly want to overwrite wholesale (rare).
 - Paths are relative to the working directory. Don't use absolute paths.
-- For multi-site changes \u2014 same file or across files \u2014 prefer \`multi_edit\` over N \`edit_file\` calls. Shape: \`{ edits: [{ path, search, replace }, ...] }\`. All edits validate before any file is written; any failure \u2192 ALL files untouched. Per-file edits run in array order, so a later edit can match text inserted by an earlier one.
+- For multi-site changes \u2014 same file or across files \u2014 prefer \`apply_patch\` or \`multi_edit\` over N \`edit_file\` calls. \`multi_edit\` shape: \`{ edits: [{ path, search, replace }, ...] }\`. Both batch tools validate before any file is written; any failure \u2192 ALL files untouched. Per-file edits run in array order, so a later edit can match text inserted by an earlier one. To create a new file inside a \`multi_edit\`, use an empty \`search\` for that file.
 
 # Trust what you already know
 
@@ -14912,7 +15147,7 @@ Before exploring the filesystem to answer a factual question, check whether the
 # Exploration
 
 - Skip dependency, build, and VCS directories unless the user explicitly asks. The pinned .gitignore block (if any, below) is your authoritative denylist.
-- Prefer \`search_files\` over \`list_directory\` when you know roughly what you're looking for \u2014 it saves context and avoids enumerating huge trees. Note: \`search_files\` matches file NAMES; for searching file CONTENTS use \`search_content\`.
+- Prefer \`search_files\` over \`list_directory\` when you know roughly what you're looking for \u2014 it saves context and avoids enumerating huge trees. Use \`search_files\` for a filename query. Use \`glob\` for wildcard file patterns. Note: \`search_files\` matches file NAMES; for searching file CONTENTS use \`search_content\`.
 - Available exploration tools: \`read_file\`, \`list_directory\`, \`directory_tree\`, \`search_files\` (filename match), \`glob\` (mtime-sorted glob \u2014 use for "what changed lately", "all *.ts under src/"), \`search_content\` (content grep \u2014 use for "where is X called", "find all references to Y"; pass \`context:N\` for grep -C N around hits), \`get_file_info\`. Don't call \`grep\` or other tools that aren't in this list \u2014 they don't exist as functions.
 
 # Path conventions
@@ -14939,6 +15174,10 @@ You have TWO tools for running shell commands, and picking the right one is non-
 
 **Never use run_command for a dev server or a download likely to exceed a minute.** It will block, time out, and the user will see a frozen tool call while the work was actually running fine. Always \`run_background\` + \`wait_for_job\` / \`job_output\`.
 
+# Explicit command order
+
+If the user explicitly asks you to run a command first (for example "\u5148\u8FD0\u884C\u6D4B\u8BD5", "run tests first", or "\u5148\u770B npm test \u5931\u8D25"), do that command before reading files or proposing edits. Do not substitute file reading, test-file inspection, or inference for the requested command execution. If the command is denied, say so and continue only within the user's constraint.
+
 After \`run_background\`, tools available to you:
 - \`job_output(jobId, tailLines?)\` \u2014 read recent logs to verify startup / debug errors.
 - \`wait_for_job(jobId, timeoutMs?, waitFor?)\` \u2014 block server-side until the job finishes (or, with \`waitFor: 'output-or-exit'\`, until it writes a new line). ONE tool call per wait regardless of duration. \`timeoutMs\` clamps at 300_000. For downloads / installs / builds: leave \`waitFor\` at the default \`'exit'\` and set \`timeoutMs\` to the slowest reasonable end-to-end. For tailing a dev server and reacting to a specific log line: pass \`waitFor: 'output-or-exit'\` with a short \`timeoutMs\`.
@@ -15041,7 +15280,7 @@ import {
   writeFileSync as writeFileSync7
 } from "fs";
 import { homedir as homedir8 } from "os";
-import { dirname as dirname9, join as join16 } from "path";
+import { dirname as dirname10, join as join16 } from "path";
 function defaultUsageLogPath(homeDirOverride) {
   return join16(homeDirOverride ?? homedir8(), ".carboncode", "usage.jsonl");
 }
@@ -15108,7 +15347,7 @@ function appendUsage(input) {
   if (input.subagent) record.subagent = input.subagent;
   const path2 = input.path ?? defaultUsageLogPath();
   try {
-    mkdirSync7(dirname9(path2), { recursive: true });
+    mkdirSync7(dirname10(path2), { recursive: true });
     appendFileSync2(path2, `${JSON.stringify(record)}
 `, "utf8");
     compactUsageLogIfLarge(path2, record.ts);