@carboncode/cli 0.1.0 → 0.1.2

package/dist/cli/{chunk-4TVNJWMA.js → chunk-ACHQFKW2.js}

@@ -3,7 +3,7 @@ import { createRequire as __cr } from 'node:module'; if (typeof globalThis.requi
 import {
   MemoryStore,
   sanitizeMemoryName
-} from "./chunk-QJG7OF27.js";
+} from "./chunk-FKSYTVWZ.js";
 import {
   countTokens,
   countTokensBounded,
@@ -12,12 +12,12 @@ import {
 } from "./chunk-6OWJV3YW.js";
 import {
   Usage
-} from "./chunk-BSGCXZQN.js";
+} from "./chunk-LNU3CR7X.js";
 import {
   applyEdit,
   applyMultiEdit,
   pauseGate
-} from "./chunk-TH756VLN.js";
+} from "./chunk-MXUSER5C.js";
 import {
   NEGATIVE_CLAIM_RULE,
   PROJECT_MEMORY_FILES,
@@ -28,7 +28,7 @@ import {
 import {
   formatHookOutcomeMessage,
   runHooks
-} from "./chunk-IX6XI2RG.js";
+} from "./chunk-OB5XR5HG.js";
 import {
   ignoredByLayers,
   loadGitignoreAt,
@@ -46,10 +46,10 @@ import {
   DEEPSEEK_CONTEXT_TOKENS,
   DEFAULT_CONTEXT_TOKENS,
   SessionStats
-} from "./chunk-ILJOIQ5W.js";
+} from "./chunk-OY5GGU6D.js";
 import {
   t
-} from "./chunk-IAUOP25G.js";
+} from "./chunk-R677DIFU.js";
 import {
   DEFAULT_INDEX_EXCLUDES,
   addProjectPathAllowed,
@@ -59,7 +59,7 @@ import {
   require_picomatch,
   webSearchEndpoint,
   webSearchEngine
-} from "./chunk-4MQ3VURH.js";
+} from "./chunk-K43DXH3G.js";
 import {
   __commonJS,
   __esm,
@@ -6415,9 +6415,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({
@@ -6431,10 +6436,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) {
@@ -7814,6 +7816,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({
@@ -7833,13 +7837,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,
@@ -7852,7 +7860,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));
     }
@@ -8337,12 +8350,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}` });
@@ -8361,7 +8376,8 @@ ${reason}`
             content: result,
             toolName: name,
             toolArgs: args,
-            callId: this.inflightIdFor(call)
+            callId: this.inflightIdFor(call),
+            elapsedMs
           };
         }
       }
@@ -9929,6 +9945,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 path = file.newPath ?? file.oldPath;
+      if (!path) 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,
+        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(path) {
+  if (path.length < 2 || !path.startsWith('"') || !path.endsWith('"')) return path;
+  try {
+    return JSON.parse(path);
+  } catch {
+    return path.slice(1, -1);
+  }
+}
+
 // src/tools/fs/search.ts
 import { promises as fs2 } from "fs";
 import * as pathMod3 from "path";
@@ -10226,10 +10346,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));
     }
@@ -10649,7 +10773,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: {
@@ -10686,6 +10810,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.",
@@ -11594,6 +11753,7 @@ export {
   detectAtPicker,
   rankPickerCandidates,
   expandAtMentions,
+  parseUnifiedPatch,
   looksLikeAbsoluteSystemPath,
   pathIsUnder,
   registerFilesystemTools,
@@ -11616,4 +11776,4 @@ export {
 he/he.js:
   (*! https://mths.be/he v1.2.0 by @mathias | MIT license *)
 */
-//# sourceMappingURL=chunk-4TVNJWMA.js.map
+//# sourceMappingURL=chunk-ACHQFKW2.js.map