@bacnh85/pi-model-tools 0.3.0 → 0.3.2

package/README.md

@@ -92,6 +92,9 @@ Rules:
 - Context+removed must match **uniquely** in the file (diverges from Codex's
   first-match for safety, matching `edit`'s philosophy). Add more context lines
   if a match is ambiguous.
+- If the `@@` anchor text repeats as the immediately-following context or
+  removed line (common when models treat `@@` as a diff-style locator header),
+  the duplicate is auto-collapsed — only one occurrence is matched.
 - Matching is progressive-fuzzy (exact → strip-trailing-ws → strip-both-ws →
   Unicode-normalize), so minor whitespace/Unicode differences still apply.
 

package/extensions/index.ts

@@ -220,7 +220,7 @@ export default function (pi: ExtensionAPI) {
     name: "apply_patch",
     label: "apply_patch",
     description: [
-      "Apply a Codex-style V4D patch to edit one or more files. Emit only changed lines plus a little surrounding context (a small diff), which is easier to get right than reproducing a large verbatim block. Supported sections: `*** Add File: <path>` (only `+` lines), `*** Delete File: <path>` (no payload), `*** Update File: <path>` or `*** Update File: <old> → <new>` (rename). Inside an Update section, each hunk is preceded by a `@@` anchor line whose text is an unchanged context line, then `-` removed lines and `+` added lines. Leading-space context lines (` `) are also allowed. Context+removed must match UNIQUELY in the file. Wrap the whole patch in `*** Begin Patch` ... `*** End Patch`.",
+      "Apply a Codex-style V4D patch to edit one or more files. Emit only changed lines plus a little surrounding context (a small diff), which is easier to get right than reproducing a large verbatim block. Supported sections: `*** Add File: <path>` (only `+` lines), `*** Delete File: <path>` (no payload), `*** Update File: <path>` or `*** Update File: <old> → <new>` (rename). Inside an Update section, each hunk is preceded by a `@@` anchor line whose text is an unchanged context line, then `-` removed lines and `+` added lines. Leading-space context lines (` `) are also allowed. If the @@ anchor text is restated as the immediately-following context or removed line, the duplicate is auto-collapsed. Context+removed must match UNIQUELY in the file. Wrap the whole patch in `*** Begin Patch` ... `*** End Patch`.",
       "",
       "Example:",
       "*** Begin Patch", "*** Update File: src/foo.ts", "@@ export function foo()", "-  return 1", "+  return 2", "*** End Patch",
@@ -229,6 +229,7 @@ export default function (pi: ExtensionAPI) {
     promptGuidelines: [
       "Use apply_patch for multi-line or multi-file edits: emit a small diff (context + -/+ lines) instead of reproducing large verbatim oldText blocks.",
       "Each Update hunk needs a unique anchor: include enough unchanged context lines so the context+removed block matches exactly once in the file.",
+      "If the @@ anchor repeats on the very next line (as space-context or -removed), the duplicate is auto-collapsed.",
       "For a single tiny one-line replacement, edit is fine; for anything larger or spanning multiple files, prefer apply_patch.",
     ],
     parameters: Type.Object({ patch: Type.String({ description: "The V4D patch text, wrapped in *** Begin Patch ... *** End Patch." }) }),
@@ -344,8 +345,12 @@ export default function (pi: ExtensionAPI) {
       if (readHint) systemPrompt = `${systemPrompt}\n\n${readHint}`;
     }
 
-    // apply_patch preference — DeepSeek V4 Flash only (GLM is better with exact-match
-    // edit; apply_patch context anchors confuse it and it lacks agentic fallback).
+    // apply_patch preference — all DeepSeek V4 (flash+pro); GLM excluded per eval.
+    // Eval (2026-07-29, 15 trials, 3 targets) showed all models use edit with zero
+    // edit_mismatch errors. DeepSeek keeps guidance as a safety net for real-world
+    // multi-file/frontmatter edits beyond the eval's scope; GLM excluded because it
+    // doesn't receive the suite of DeepSeek-specific steering (Super Power, selection
+    // guidance, semantic-miss blocking) and thus doesn't need the companion hint.
     if (activeFamily === "deepseek-v4") {
       const patchHint = applyPatchPreferenceGuidance(activeForHint);
       if (patchHint) systemPrompt = `${systemPrompt}\n\n${patchHint}`;

package/extensions/lib/apply-patch.ts

@@ -21,6 +21,10 @@
  * Divergence from Codex: context+removed blocks must match UNIQUELY (Codex
  * takes the first match). Silent wrong-location edits are worse than a clear
  * error, and this matches pi's own `edit` philosophy.
+ *
+ * Leniency: if the @@ anchor text repeats as the immediately-following context
+ * or removed line (common when models treat `@@` as a git-diff-style locator
+ * header), the duplicate is collapsed automatically.
  */
 
 import { readFile, writeFile, unlink } from "node:fs/promises";
@@ -208,6 +212,17 @@ function eqRstrip(a: string, b: string) { return a.trimEnd() === b.trimEnd(); }
 function eqTrim(a: string, b: string) { return a.trim() === b.trim(); }
 function eqUnicode(a: string, b: string) { return normalizeAscii(a) === normalizeAscii(b); }
 
+/**
+ * Loose equality matching seekSequence's 4-pass progression. Used for dedup
+ * so the collapse is consistent with the matcher's own fuzzy boundaries.
+ */
+function linesLooselyEqual(a: string, b: string): boolean {
+  return a === b
+    || a.trimEnd() === b.trimEnd()
+    || a.trim() === b.trim()
+    || normalizeAscii(a) === normalizeAscii(b);
+}
+
 /**
  * Count matches of `pattern` lines within `lines`, trying progressively
  * lenient equality. Returns count and first start index under the strictest
@@ -325,12 +340,23 @@ export async function applyPatchToFiles(parsed: ParsedPatch, cwd: string): Promi
         const newHunks: { start: number; removedLen: number; added: string[] }[] = [];
 
         for (const h of hunks) {
-          const anchor = [...h.context, ...h.removed];
-          const { count, firstIndex, exact: hExact } = seekSequence(work, anchor);
+          // ponytail: collapse a redundant @@ anchor the model restated as
+          // the first payload line (context or removed). Models treat `@@` like
+          // a git-diff locator header and repeat it as context/removed, which
+          // would otherwise require the line to appear twice consecutively in
+          // the file. Real Codex makes @@ a pure cursor-advance locator; we keep
+          // it in the match block so unique-match disambiguation still works
+          // (@@ fn / -dup), but drop the duplicate. Upgrade to full cursor
+          // semantics if unique-match is ever relaxed.
+          let matchBlock = [...h.context, ...h.removed];
+          if (matchBlock.length >= 2 && linesLooselyEqual(matchBlock[0], matchBlock[1])) {
+            matchBlock = matchBlock.slice(1);
+          }
+          const { count, firstIndex, exact: hExact } = seekSequence(work, matchBlock);
           if (!hExact) exact = false;
           if (count === 0) throw new Error(`Hunk context not found in ${op.path}. Ensure context lines match the file.`);
           if (count > 1) throw new Error(`Hunk context is ambiguous (${count} matches) in ${op.path}. Add more surrounding context lines to make it unique.`);
-          const removedStart = firstIndex + h.context.length;
+          const removedStart = firstIndex + (matchBlock.length - h.removed.length);
           newHunks.push({ start: removedStart, removedLen: h.removed.length, added: h.added });
         }
 

package/extensions/lib/guidance.ts

@@ -96,18 +96,21 @@ export function deepSeekSelectionGuidance(activeTools: readonly string[]): strin
 // ── apply_patch preference hint (DeepSeek/GLM) ──
 
 /**
- * When apply_patch is available, tell weaker models to prefer it over edit for
- * anything beyond a single tiny replacement. Returns undefined if the tool is
- * not active so it never misdirects. Gated to DeepSeek/GLM by the caller (see
- * index.ts before_agent_start), since Claude/OpenAI are already reliable with edit.
+ * When apply_patch is available, tell the model to prefer it over edit for
+ * anything beyond a small change (>3 lines, YAML frontmatter, or
+ * multi-hunk/multi-file). Returns undefined if the tool is not active so it
+ * never misdirects. Gated per family by the caller (see index.ts
+ * before_agent_start).
  */
 export function applyPatchPreferenceGuidance(activeTools: readonly string[]): string | undefined {
   if (!activeTools.includes("apply_patch")) return undefined;
   return [
     "apply_patch (preferred for non-trivial edits):",
-    "  • For multi-line, multi-hunk, or multi-file edits, emit a small V4D diff (context + -/+ lines) via apply_patch instead of reproducing large verbatim oldText blocks — far fewer match failures.",
+    "  • For multi-line (>3 lines), multi-hunk, or multi-file edits, emit a small V4D diff (context + -/+ lines) via apply_patch instead of reproducing large verbatim oldText blocks — far fewer match failures.",
     "  • Each Update hunk must anchor on enough unchanged context that the context+removed block matches UNIQUELY in the file.",
-    "  • Keep using edit for a single tiny one-line exact replacement.",
+    "  • Keep using edit for a single tiny one-line exact replacement (≤3 lines).",
+    "  • Touching frontmatter (YAML) — always use apply_patch. YAML is whitespace-sensitive; edit\'s exact-match oldText rarely succeeds on the first try.",
+    "  • One-strike rule: if edit fails once, stop — switch to apply_patch, do not retry edit.",
   ].join("\n");
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bacnh85/pi-model-tools",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "description": "Unified tool-wrapping, argument repair, reasoning management, DeepSeek V4 guidance + Super Power Mode, defensive leak-cleaning, edit mismatch repair (read-notice stripping + trim-tolerant retry), and a Codex-style apply_patch diff tool for DeepSeek V4 and GLM model families from any provider.",
     "type": "module",
     "license": "MIT",