typebulb 0.28.1 → 0.28.3

package/dist/agents/pi/matchu-patchu.ts

@@ -5,7 +5,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { Type } from "typebox";
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/utils/textUtils.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/utils/textUtils.js
 var TextUtils = class _TextUtils {
   static NormalizeToLf(text) {
     return (text ?? "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
@@ -103,7 +103,7 @@ var TextUtils = class _TextUtils {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/utils/arrayUtils.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/utils/arrayUtils.js
 var ArrayUtils = class {
   /// <summary>
   /// Groups items by key, preserving first-seen key order (like LINQ's GroupBy).
@@ -141,7 +141,7 @@ var ArrayUtils = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/models.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/models.js
 var PatchInputFile = class {
   Key;
   InputFullText;
@@ -201,12 +201,6 @@ var PatchOutput = class {
   constructor(Files) {
     this.Files = Files;
   }
-  // Patch-scoped errors that belong to no input file: hunks naming files outside
-  // the input set (FileMismatch). Kept off the per-file channel so one foreign
-  // hunk cannot mark otherwise-clean files as failed — per-file Errors are about
-  // that file only. Loudness is preserved: throw-mode still throws these, and
-  // callers composing success replies must consult BOTH channels.
-  Errors = [];
 };
 var LineType;
 (function(LineType2) {
@@ -252,6 +246,11 @@ var Hunk = class {
   // Set by the parser under ControlCharPolicy 'warn' when this hunk's insert
   // lines carried raw control characters.
   ControlCharsSuspected = false;
+  // Error-reporting stand-in Chunk for a hunk that was never anchored: its lines
+  // and diff location, no match.
+  ToUnanchoredChunk() {
+    return new Chunk([], this.Lines.filter((l) => l.Type == LineType.Delete).map((l) => l.Text), this.Lines.filter((l) => l.Type == LineType.Insert).map((l) => l.Text), [], UniqueMatch.NotFound, new DiffLocation(this));
+  }
 };
 var Edit = class _Edit {
   LineIndex;
@@ -370,7 +369,7 @@ var UniqueMatch = class _UniqueMatch {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/utils/yaml.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/utils/yaml.js
 var Yaml = class _Yaml {
   _sb = [];
   // -------- Public API --------
@@ -427,7 +426,7 @@ var Yaml = class _Yaml {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/exceptions.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/exceptions.js
 var PatchException = class extends Error {
   Error;
   constructor(error) {
@@ -443,13 +442,17 @@ var PatchParserException = class extends Error {
 var PatchError = class {
   Type;
   FailedMatch;
-  // For FileMismatch: the foreign file key the hunk group named, so callers can
-  // say WHICH file's hunks were ignored (and match it against their own target).
+  // The file key(s) the error concerns: the foreign key a FileMismatch named, or
+  // the comma-joined candidate keys of an ambiguous headerless routing; null otherwise.
   FileKey;
-  constructor(errorType, chunk, fileKey = null) {
+  // Diagnosis computed against the file at error time (e.g. the quoted line
+  // occurs inside one longer file line); null when no confident diagnosis.
+  Hint;
+  constructor(errorType, chunk, fileKey = null, hint = null) {
     this.Type = errorType;
     this.FailedMatch = chunk;
     this.FileKey = fileKey;
+    this.Hint = hint;
   }
   toString() {
     return `Failed to patch text with the diff provided.
@@ -470,6 +473,8 @@ ${this.SuggestedFixYaml}`;
     if (this.FileKey != null)
       y.Scalar("  File", this.FileKey);
     y.Folded("  Summary", SummaryFor(this.Type));
+    if (this.Hint != null)
+      y.Folded("  Hint", this.Hint);
     y.Section("  Details");
     y.Section("    FailedMatch");
     y.Block("      ContextBefore", this.FailedMatch.ContextBefore);
@@ -483,7 +488,7 @@ ${this.SuggestedFixYaml}`;
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/applier/guards.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/applier/guards.js
 var DuplicateGuard = class _DuplicateGuard {
   // Two chunks that resolve to the same anchor with the same deletes and inserts are
   // provably the same edit (an LLM re-emitting a hunk). Applying it once is
@@ -533,7 +538,7 @@ var OverlapGuard = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/applier/editMinimizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/applier/editMinimizer.js
 var EditMinimizer = class _EditMinimizer {
   static Same(a, b) {
     return a === b;
@@ -567,7 +572,7 @@ var EditMinimizer = class _EditMinimizer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/applier/indenter.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/applier/indenter.js
 var Anchor = class {
   BaseIndent;
   Shift;
@@ -658,7 +663,40 @@ var Indenter = class _Indenter {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/applier/chunkApplier.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/applier/matchHint.js
+var MatchHint = class _MatchHint {
+  // A quoted line inside exactly one longer file line is the prose line-model
+  // mistake: the author's "line" (a sentence of an unwrapped paragraph, or a
+  // re-flowed hard wrap) is a slice of the file's physical line. Matching stays
+  // refused — a head fragment is byte-identical to an elided whole-line delete,
+  // so either auto-reading risks silent corruption — but naming the line is
+  // correct under both readings: the retry re-quotes it whole.
+  static SubLine(chunk, lines) {
+    for (const q of chunk.DeleteLinesWithContext()) {
+      if (q.trim().length < _MatchHint.MinHintLineContent)
+        continue;
+      if (lines.includes(q))
+        continue;
+      const containing = [];
+      for (let i = 0; i < lines.length && containing.length < 2; i++)
+        if (lines[i].length > q.length && lines[i].includes(q))
+          containing.push(i);
+      if (containing.length != 1)
+        continue;
+      return `The diff line "${_MatchHint.Preview(q)}" matches only PART of line ${containing[0] + 1}, which is ${lines[containing[0]].length} characters long \u2014 in prose, a whole paragraph is often one physical line. Re-send the diff quoting entire lines exactly.`;
+    }
+    return null;
+  }
+  static Preview(s) {
+    const t = s.trim();
+    return t.length <= 60 ? t : t.slice(0, 57) + "...";
+  }
+  // Trimmed length a quoted line must reach before containment counts as
+  // evidence: short strings occur inside longer lines by coincidence.
+  static MinHintLineContent = 12;
+};
+
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/applier/chunkApplier.js
 var InputChunks = class {
   InputFullText;
   Chunks;
@@ -722,12 +760,12 @@ var ChunkApplier = class _ChunkApplier {
     if (match.IsAmbiguous)
       throw new PatchException(new PatchError("MatchAmbiguous", chunk));
     if (match.IsNotFound)
-      throw new PatchException(new PatchError("MatchNotFound", chunk));
+      throw new PatchException(new PatchError("MatchNotFound", chunk, null, MatchHint.SubLine(chunk, lines)));
     return new Edit(match.LineIndex, Array.from(chunk.DeleteLines), Indenter.AlignInsert(lines, chunk), match.Fuzz);
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/heuristics.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/heuristics.js
 var DiffContentHeuristics = class _DiffContentHeuristics {
   /**
    * Checks if a line starts with a doubled marker (++ or --)
@@ -952,7 +990,7 @@ var DiffContentHeuristics = class _DiffContentHeuristics {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/hunkBuilder.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/hunkBuilder.js
 var Header = class _Header {
   Path;
   OldStart;
@@ -1160,7 +1198,7 @@ ${h.NewText}`;
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/unifiedDiffParser.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/unifiedDiffParser.js
 var UnifiedDiffParser = class _UnifiedDiffParser {
   /**
    * Parse a unified diff into structured hunks.
@@ -1399,7 +1437,7 @@ var UnifiedDiffParser = class _UnifiedDiffParser {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/anchorer/hunkSlicer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/anchorer/hunkSlicer.js
 var Block = class {
   StartIndex;
   EndIndex;
@@ -1452,7 +1490,7 @@ var HunkSlicer = class _HunkSlicer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/anchorer/search.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/anchorer/search.js
 var Match = class {
   LineIndex;
   Fuzz;
@@ -1590,7 +1628,7 @@ var Search = class _Search {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/anchorer/blockAnchorer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/anchorer/blockAnchorer.js
 var BlockAnchorer = class _BlockAnchorer {
   static AnchorBlocks(hunk, blocks, lines, options) {
     return blocks.map((focus, index) => {
@@ -1708,7 +1746,7 @@ var BlockAnchorer = class _BlockAnchorer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/anchorer/hunkAnchorer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/anchorer/hunkAnchorer.js
 var AnchorOutcome = class {
   Chunks;
   AlreadyAppliedCount;
@@ -1876,7 +1914,7 @@ var HunkAnchorer = class _HunkAnchorer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/selectionTarget.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/selectionTarget.js
 var SelectionTarget = class {
   FullText;
   SelectedText;
@@ -1908,7 +1946,7 @@ var SelectionTarget = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/shared.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/shared.js
 function isDiffMarker(line) {
   return line.startsWith("--- ") || line.startsWith("+++ ") || line.startsWith("@@") || line.startsWith("diff --git");
 }
@@ -1965,7 +2003,7 @@ function isLikelyFileHeader(trimmed) {
   return trimmed.startsWith("diff --git") || (trimmed.startsWith("--- ") || trimmed.startsWith("+++ ")) && (trimmed.includes(".") || trimmed.includes("/") || trimmed.includes("\\"));
 }
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/customFormatSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/customFormatSanitizer.js
 var CustomFormatSanitizer = class _CustomFormatSanitizer {
   static OPERATIONS = [
     { header: /^\s*\*\*\* Update File: (.+)$/i, fromPath: (p) => `a/${p}`, toPath: (p) => `b/${p}` },
@@ -1990,7 +2028,7 @@ var CustomFormatSanitizer = class _CustomFormatSanitizer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/decoratedHeaderSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/decoratedHeaderSanitizer.js
 var DecoratedHeaderSanitizer = class _DecoratedHeaderSanitizer {
   static DECORATED_HEADER_REGEX = /^(---|\+\+\+)\s+(.+?)\s+(---|\+\+\+)+\s*$/;
   static process(text) {
@@ -2003,7 +2041,7 @@ var DecoratedHeaderSanitizer = class _DecoratedHeaderSanitizer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/decorativeMarkerSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/decorativeMarkerSanitizer.js
 var DecorativeMarkerSanitizer = class _DecorativeMarkerSanitizer {
   static process(text) {
     return transformOutsideHunkBodies(text, (line) => _DecorativeMarkerSanitizer.isDecorativeMarker(line.trim()) ? null : line);
@@ -2024,14 +2062,14 @@ var DecorativeMarkerSanitizer = class _DecorativeMarkerSanitizer {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/backtickSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/backtickSanitizer.js
 var BacktickSanitizer = class {
   static process(text) {
     return text.replace(/^```+\s*diff\b/gmi, "```diff").replace(/^```+$/gm, "```");
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/diffBlockReunifier.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/diffBlockReunifier.js
 var DiffBlockReunifier = class {
   static process(text) {
     const lines = text.split("\n");
@@ -2067,7 +2105,7 @@ var DiffBlockReunifier = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/devNullSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/devNullSanitizer.js
 var DevNullSanitizer = class {
   static process(text, fileKeys) {
     if (!fileKeys?.length)
@@ -2110,7 +2148,7 @@ var DevNullSanitizer = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/sanitizers/prefixInjector.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/sanitizers/prefixInjector.js
 var PrefixInjector = class {
   static process(text) {
     const lines = text.split("\n");
@@ -2169,7 +2207,7 @@ var PrefixInjector = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/parser/diffSanitizer.js
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/parser/diffSanitizer.js
 var DiffSanitizer = class {
   static Process(diff, fileKeys) {
     if (!diff?.trim())
@@ -2185,17 +2223,49 @@ var DiffSanitizer = class {
   }
 };
 
-// ../node_modules/.pnpm/matchu-patchu@0.2.0/node_modules/matchu-patchu/dist/patcher.js
-var Patcher = class _Patcher {
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/headerlessRouter.js
+var HeaderlessRouter = class {
+  static Route(fileHunks, files, options) {
+    const group = fileHunks.find((g) => g.Key == "");
+    if (group == null || files.some((f) => f.Key == ""))
+      return [];
+    const probeOptions = Object.assign(new PatchOptions(), options, { ContinueOnError: true });
+    const candidates = files.filter((f) => {
+      const target = new SelectionTarget(f.InputFullText, f.InputSelectedText).TargetText;
+      const anchored = HunkAnchorer.Anchor(target, group.Hunks, probeOptions);
+      return ChunkApplier.Apply(target, anchored.Chunks, probeOptions).Errors.length == 0;
+    });
+    if (candidates.length == 1) {
+      fileHunks.splice(fileHunks.indexOf(group), 1);
+      const existing = fileHunks.find((g) => g.Key == candidates[0].Key);
+      if (existing)
+        existing.Hunks.push(...group.Hunks);
+      else
+        fileHunks.push(new FileHunkGroup(candidates[0].Key, group.Hunks));
+      return [];
+    }
+    return [candidates.length == 0 ? new PatchError("MatchNotFound", group.Hunks[0].ToUnanchoredChunk(), null, "The diff has no file headers and its content did not match any file being patched. Make sure context and deleted lines match the target file, and add '--- <file>' / '+++ <file>' headers naming it.") : new PatchError("MatchAmbiguous", group.Hunks[0].ToUnanchoredChunk(), candidates.map((f) => f.Key).join(", "), "The diff has no file headers and its content matched more than one file being patched. Add '--- <file>' / '+++ <file>' headers naming the intended file.")];
+  }
+};
+
+// ../node_modules/.pnpm/matchu-patchu@0.3.1/node_modules/matchu-patchu/dist/patcher.js
+var Patcher = class {
   static Apply(diff, files, options) {
     options = options ?? new PatchOptions();
     const fileKeys = files.map((f) => f.Key);
     const fileContents = new Map(files.map((f) => [f.Key, f.InputFullText]));
     diff = options.SanitizeDiff ? DiffSanitizer.Process(diff, fileKeys) : diff;
     const fileHunks = UnifiedDiffParser.Parse(diff, fileContents, options.Truncation, options.ControlChars);
-    const foreignErrors = fileHunks.filter((g) => g.Key != "" && !fileContents.has(g.Key)).map((g) => new PatchError("FileMismatch", _Patcher.ForeignChunk(g.Hunks[0]), g.Key));
-    if (foreignErrors.length > 0 && !options.ContinueOnError)
-      throw new PatchException(foreignErrors[0]);
+    const routingErrors = HeaderlessRouter.Route(fileHunks, files, options);
+    const namedKeys = fileKeys.filter((k) => k != "");
+    const rosterHint = namedKeys.length > 0 ? `Files being patched: ${namedKeys.join(", ")}.` : null;
+    const reportEntry = (key, errors) => new PatchOutputFile(key, 0, [], "", "", "", errors);
+    const reportFiles = fileHunks.filter((g) => g.Key != "" && !fileContents.has(g.Key)).map((g) => reportEntry(g.Key, [new PatchError("FileMismatch", g.Hunks[0].ToUnanchoredChunk(), g.Key, rosterHint)]));
+    if (routingErrors.length > 0)
+      reportFiles.unshift(reportEntry("", routingErrors));
+    const reportErrors = reportFiles.flatMap((f) => f.Errors);
+    if (reportErrors.length > 0 && !options.ContinueOnError)
+      throw new PatchException(reportErrors[0]);
     const patchOutputFiles = files.map((f) => {
       const targetSelection = new SelectionTarget(f.InputFullText, f.InputSelectedText);
       const targetText = targetSelection.TargetText;
@@ -2204,20 +2274,13 @@ var Patcher = class _Patcher {
       const outputEdits = ChunkApplier.Apply(targetText, anchored.Chunks, options);
       return new PatchOutputFile(f.Key, outputEdits.Edits.map((h) => h.Fuzz).reduce((a, b) => a + b, 0), outputEdits.Edits.map((e) => e.Shift(targetSelection.LineOffset)), f.InputSelectedText, f.InputFullText, targetSelection.Replace(outputEdits.OutputText), [...outputEdits.Errors], anchored.AlreadyAppliedCount, hunks.flatMap((h) => h.Lines).filter((l) => l.CollapsedFrom != null).map((l) => l.CollapsedFrom), hunks.some((h) => h.TruncationSuspected), hunks.some((h) => h.ControlCharsSuspected));
     });
-    const output = new PatchOutput(patchOutputFiles);
-    output.Errors = foreignErrors;
-    return output;
-  }
-  // Error-reporting stand-in for a hunk that was never anchored (it names a file
-  // that isn't being patched): its lines and diff location, no match.
-  static ForeignChunk(h) {
-    return new Chunk([], h.Lines.filter((l) => l.Type == LineType.Delete).map((l) => l.Text), h.Lines.filter((l) => l.Type == LineType.Insert).map((l) => l.Text), [], UniqueMatch.NotFound, new DiffLocation(h));
+    return new PatchOutput([...patchOutputFiles, ...reportFiles]);
   }
 };
 
 // cli/agents/pi/server/piPatcherExtension.ts
 var DESCRIPTION = true ? "Apply unified diffs to files \u2014 tolerant of form, strict about intent. Repairs sloppy AI-generated diffs (mangled headers, whitespace drift, missing prefixes; line numbers can be wrong or absent \u2014 hunks anchor by fuzzy-matched context lines) and applies all hunks atomically when the intent is unambiguous; fails with a precise, typed error when it isn't. Use for multi-hunk edits in one step, or when exact string-replacement editing fails on whitespace or invisible characters." : "Apply unified diffs to files.";
-var BUILD_TAG = true ? "matchu-patchu-pi 0.2.0, built 2026-07-16 09:21:29" : "matchu-patchu-pi dev";
+var BUILD_TAG = true ? "matchu-patchu-pi 0.3.1, built 2026-07-16 18:09:29" : "matchu-patchu-pi dev";
 var errorBlocks = (errors) => {
   const parts = [`Patch failed with ${errors.length} error(s):`];
   for (const e of errors) parts.push("", e.toString());
@@ -2227,8 +2290,8 @@ var noOpMessage = (target, alreadyApplied) => alreadyApplied > 0 ? `Applied 0 ed
 var fuzzNote = (fuzz) => fuzz > 0 ? ` (applied with fuzz factor ${fuzz})` : "";
 function discoverDiffKeys(diff) {
   const keys = [];
-  for (const e of Patcher.Apply(diff, []).Errors) {
-    if (e.FileKey && !keys.includes(e.FileKey)) keys.push(e.FileKey);
+  for (const f of Patcher.Apply(diff, []).Files) {
+    if (f.Key && !keys.includes(f.Key)) keys.push(f.Key);
   }
   return keys;
 }
@@ -2256,7 +2319,7 @@ function applyMulti(cwd, diff, dryRun) {
     return { ok: false, message: missing.map((k) => `Error: file not found: ${k}`).join("\n") };
   const inputs = keys.map((k) => new PatchInputFile(k, readFileSync(resolve(cwd, k), "utf-8")));
   const result = Patcher.Apply(diff, inputs);
-  const errors = [...result.Errors, ...result.Files.flatMap((f) => f.Errors)];
+  const errors = result.Files.flatMap((f) => f.Errors);
   if (errors.length > 0) return { ok: false, message: errorBlocks(errors) };
   const lines = [];
   const dryOutputs = [];

package/dist/agents/pi/styles.css

@@ -817,16 +817,27 @@ a.server-port:hover { text-decoration: underline; }
    the logs-link register — marks the category and opens the bulb's published page. A remote
    (not-yet-downloaded) row's name is additionally muted and inert (no file to open), and its
    time column stays empty (no mtime to show). */
-.server-name.remote { color: var(--muted); cursor: default; }
+.server-name.remote { cursor: default; }
 .server-name.remote:hover { text-decoration: none; }
 .sample-link { color: var(--muted); font-size: .76rem; text-decoration: none; cursor: pointer; flex: none; }
 .sample-link:hover { color: var(--accent); text-decoration: underline; }
-/* The samples-catalog fold header (bulbsPill.ts groupRow): caret in the button column, muted label
-   spanning the remaining tracks. Pitch, hover, and the keyboard highlight inherit from .server-row. */
+/* The remote fold (bulbsPill.ts groupRow / fold-row): the header and the remote rows within share
+   one veil step over the menu's panel bg (the picker-peek shade) as ONE contiguous band — each
+   row's ::before bridges the grid row-gap up to the row above, junction corners square off, and
+   only the band's outer corners round (the header's top; the last row's bottom, via :has). The
+   accent label marks the header. Single-class selectors on purpose: .server-row:hover/.active
+   outrank them, so the highlight tints still win. */
 .sample-group { cursor: pointer; color: var(--muted); }
-.sample-group:hover, .sample-group.active { color: var(--fg); }
+.sample-group, .fold-row { background: linear-gradient(var(--veil), var(--veil)), var(--panel); }
+.sample-group.open { border-radius: 6px 6px 0 0; }
+.fold-row { position: relative; border-radius: 0; }
+.fold-row::before {
+  content: ''; position: absolute; left: 0; right: 0; top: -.15rem; height: .15rem;
+  background: linear-gradient(var(--veil), var(--veil)), var(--panel);
+}
+.fold-row:not(:has(+ .fold-row)) { border-radius: 0 0 6px 6px; }
 .sample-group .caret-tri { justify-self: center; }
-.sample-group-label { grid-column: 2 / -1; }
+.sample-group-label { grid-column: 2 / -1; color: var(--accent); }
 /* The 1fr name column: name + (in full-text mode) its hit count read together, the badge
    right-aligned at the column's end by the name's flex:1 — the session row's preview/hits layout. */
 .bulb-name-cell { display: flex; align-items: baseline; gap: .6rem; min-width: 0; }

package/dist/index.js

@@ -1915,5 +1915,5 @@ ${oP}
 `);let a=0,c=Promise.resolve();Vt({target:r,onChange:()=>{let l=++a;c=c.then(async()=>{if(l===a)try{console.log("Re-running..."),await o()}catch(d){console.error("Error:",d)}})}})}}mt();import{Console as fP}from"node:console";Ne();async function fy(r,e,t,n){gP();try{let f=Sr(await Y(),r)[0];f&&(_i(f.pid,Re(f.pid).offset),console.error(`note: 'call' boots a fresh server.ts instance; the running server (${f.url}) is not contacted \u2014 state shared with it must live on disk.`))}catch{}let s=ge(t),{bulb:i,config:o}=await xe(r);i.server||Yn("This bulb has no **server.ts** block; nothing to call."),pt(s,r,i.server);let a;try{a=await On(i.server,r,n,o.dependencies)}catch(f){Yn(f instanceof Error?f.message:String(f))}let c=ko(a,e.fn);if(!c){let f=[...Object.keys(a).filter(p=>typeof a[p]=="function"),...Object.keys(So)];Yn(`Function '${e.fn}' not found. Available: ${f.length?f.join(", "):"(none)"}.`)}let l=await dP(e);if(xo(c)){try{for await(let f of c(...l))await uy(JSON.stringify(f,dy)+`
 `)}catch(f){Yn(f instanceof Error?f.stack??f.message:String(f))}return ly(0)}let d;try{d=await c(...l)}catch(f){Yn(f instanceof Error?f.stack??f.message:String(f))}let u=hP(d);u!==void 0&&await uy(u+`
 `),ly(0)}function ly(r){process.exitCode=r,setTimeout(()=>process.exit(r),2e3).unref?.()}async function dP(r){if(r.hasArgsFlag){let e=r.argsJson??"";return e==="-"&&(e=await yP()),mP(e)}return pP(r.positional)}function pP(r){return r.map(e=>{try{return JSON.parse(e)}catch{return e}})}function mP(r){let e;try{e=JSON.parse(r)}catch(t){throw new Error(`--args must be a JSON array: ${t instanceof Error?t.message:String(t)}`)}if(!Array.isArray(e))throw new Error(`--args must be a JSON array, got ${e===null?"null":typeof e}`);return e}function hP(r){if(r!==void 0)return JSON.stringify(r,dy,2)}function dy(r,e){return typeof e=="bigint"?e.toString():e}function Yn(r){process.stderr.write(r+`
-`),process.exit(1)}function gP(){let r=new fP(process.stderr,process.stderr);console.log=r.log.bind(r),console.info=r.info.bind(r),console.debug=r.debug.bind(r),console.dir=r.dir.bind(r)}function uy(r){return new Promise((e,t)=>{process.stdout.write(r,n=>n?t(n):e())})}async function yP(){let r=[];for await(let e of process.stdin)r.push(e);return Buffer.concat(r).toString("utf-8")}var Xl="0.28.1";function py(r,e){r||(console.error(`This bulb runs server-side Node code (server.ts), which --trust must authorize:
+`),process.exit(1)}function gP(){let r=new fP(process.stderr,process.stderr);console.log=r.log.bind(r),console.info=r.info.bind(r),console.debug=r.debug.bind(r),console.dir=r.dir.bind(r)}function uy(r){return new Promise((e,t)=>{process.stdout.write(r,n=>n?t(n):e())})}async function yP(){let r=[];for await(let e of process.stdin)r.push(e);return Buffer.concat(r).toString("utf-8")}var Xl="0.28.3";function py(r,e){r||(console.error(`This bulb runs server-side Node code (server.ts), which --trust must authorize:
   ${e}`),process.exit(1))}async function bP(){let r=pu(process.argv.slice(2));if(r.version&&(console.log(`typebulb ${Xl}`),process.exit(0)),r.help&&(mu(),process.exit(0)),Ig(),r.subcommand==="logs"){await Jg(r.file||void 0,{follow:r.follow,clear:r.clear,run:r.run,lines:r.lines});return}if(r.subcommand==="wait"){await Kg(r.file||void 0,{match:r.match,timeoutSec:r.timeoutSec});return}if(r.subcommand==="stop"){r.stopScope?await Wg(r.stopScope):await Hg(r.file||void 0);return}if(r.subcommand==="send"){await Vg(r.file,r.sendMessage,r.sendWaitMs??0);return}if(r.subcommand==="skill"){await Fg(Xl);return}if(r.subcommand==="models"){await Bg(r.mode);return}if(r.subcommand==="pull"){await Bm(r.file||void 0,{force:r.force,mode:r.mode});return}if(r.subcommand==="push"){await qm(r.file||void 0,{force:r.force,mode:r.mode});return}if(r.subcommand==="agent"){await(r.agentTarget?oy(r):Dg(Xl));return}if(r.subcommand==="trust"||r.subcommand==="untrust"){await Ng(r.file||void 0,r.subcommand==="trust");return}let e;if(!r.file||r.file==="."){let c=await om(process.cwd());c||(console.error("No .bulb.md file found in current directory"),process.exit(1)),e=c}else e=Gt.resolve(r.file);await my.access(e).then(()=>!0,()=>!1)||(Rr().includes(r.file)&&(console.error(`To open the ${r.file} agent mirror, run: npx typebulb agent:${r.file}`),process.exit(1)),console.error(`File not found: ${e}`),process.exit(1)),e.endsWith(".bulb.md")||(console.error("File must have .bulb.md extension"),process.exit(1));let n=r.file&&r.file!=="."?r.file:Gt.relative(process.cwd(),e)||Gt.basename(e),s=`npx typebulb --trust ${n.includes(" ")?`"${n}"`:n}`;if(r.subcommand==="predict"){await Rg(e,s);return}let i=!r.noTrust&&Bt(e);i&&!r.trust&&console.error("trust: granted from memory (run `typebulb untrust` to revoke)"),r.trust=r.noTrust?!1:r.trust||i;let o;try{o=await xe(e)}catch{}let a;if(r.local){o&&!(r.local.name in(o.config.dependencies??{}))&&(console.error(`--replace: '${r.local.name}' is not a dependency in this bulb's config.json; nothing to replace.`),process.exit(1)),o&&r.subcommand!=="call"&&(!o.bulb.code||r.server)&&console.warn("warning: --replace has no effect in server mode (the override is client-only).");try{a=await fu(r.local)}catch(c){console.error(c instanceof Error?c.message:String(c)),process.exit(1)}console.error(`replace: ${a.name} \u2192 ${Gt.relative(process.cwd(),a.dir)||"."}`)}if(r.subcommand==="check"){await _g(e,a);return}if(r.subcommand==="call"){py(r.trust,s),await fy(e,{fn:r.fn,positional:r.callArgs,argsJson:r.argsJson,hasArgsFlag:r.hasArgsFlag},r.mode,a);return}if(o&&o.bulb.server&&(zs(o.bulb)||r.server)){py(r.trust,s),await cy(e,r.watch,r.mode,a);return}await ry(e,r,s,a)}bP().catch(r=>{console.error("Error:",r.message),process.exit(1)});