@ladbabynpm/picc-edit 0.1.0 → 0.1.1

package/README.md

@@ -1,5 +1,7 @@
 # picc-edit
 
+[![npm downloads](https://img.shields.io/npm/dt/@ladbabynpm/picc-edit.svg)](https://www.npmjs.com/package/@ladbabynpm/picc-edit)
+
 Claude Code style **Edit** tool for [pi](https://pi.dev) — a faithful port of Claude Code's `Edit` tool, overriding pi's built-in `edit`.
 
 Part of [picc](https://github.com/Ladbaby/picc), a pi agent setup mirroring Claude Code's harness.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ladbabynpm/picc-edit",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Claude Code style Edit tool for pi — a faithful port of Claude Code's `Edit` (exact string replacement, quote normalization, read-first guard, replace_all, structured diff).",
   "type": "module",
   "main": "index.ts",

package/src/diff.ts

@@ -62,13 +62,18 @@ export function countLinesChanged(
 }
 
 /**
- * Generate a display-oriented diff string using a **unified** line-number
- * counter (the new file's line number for all lines).
+ * Generate a display-oriented diff string matching Claude Code's `Edit`
+ * output format:
+ *   - The line number is right-aligned, then the `+`/`-` marker sits to its
+ *     right (context lines leave the marker column blank).
+ *   - Line numbering uses **two independent counters**:
+ *       - Added:   new-file line number (counter advances)
+ *       - Removed: old-file line number (old counter advances; the new counter
+ *                  does NOT advance for removed lines)
+ *       - Context: new-file line number (both counters advance)
  *
- * Numbering rules:
- *   - Context: ` NNN content`, counter advances
- *   - Added:   `+NNN content`, counter advances
- *   - Removed: `-NNN content`, counter does NOT advance
+ * Example (old = `a,b,c,d,e`; new = `a,c,e` — removes `b` and `d`):
+ *   ` 1   a`, ` 2 - b`, ` 2   c`, ` 4 - d`, ` 3   e`
  *
  * Context collapsing mirrors pi's `generateDiffString`: only up to
  * `contextLines` lines are shown before/after a change; larger gaps are
@@ -87,9 +92,19 @@ export function generateDisplayDiff(
   const maxLineNum = Math.max(oldLines.length, newLines.length);
   const lineNumWidth = String(maxLineNum).length;
 
+  let oldLineNum = 1;
   let newLineNum = 1;
   let lastWasChange = false;
 
+  // Emit one diff line. `marker` is "+", "-" or " " (blank column for
+  // context). Layout: `<gutter-space><right-aligned num><space><marker><space><content>`,
+  // so changed/context columns align and the marker sits to the right of the
+  // line number (matching Claude Code's `7 +` / `10 -` rendering).
+  const emitLine = (num: number, marker: string, line: string) => {
+    const lineNum = String(num).padStart(lineNumWidth, " ");
+    output.push(` ${lineNum} ${marker} ${line}`);
+  };
+
   for (let i = 0; i < parts.length; i++) {
     const part = parts[i];
     const raw = part.value.split("\n");
@@ -99,12 +114,12 @@ export function generateDisplayDiff(
 
     if (part.added || part.removed) {
       for (const line of raw) {
-        const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
         if (part.added) {
-          output.push(`+${lineNum} ${line}`);
+          emitLine(newLineNum, "+", line);
           newLineNum++;
         } else {
-          output.push(`-${lineNum} ${line}`);
+          emitLine(oldLineNum, "-", line);
+          oldLineNum++;
         }
       }
       lastWasChange = true;
@@ -115,54 +130,41 @@ export function generateDisplayDiff(
       const hasLeadingChange = lastWasChange;
       const hasTrailingChange = nextPartIsChange;
 
+      const emitContext = (lines: string[]) => {
+        for (const line of lines) {
+          emitLine(newLineNum, " ", line);
+          oldLineNum++;
+          newLineNum++;
+        }
+      };
+      const emitEllipsis = (skipped: number) => {
+        output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
+        oldLineNum += skipped;
+        newLineNum += skipped;
+      };
+
       if (hasLeadingChange && hasTrailingChange) {
         if (raw.length <= contextLines * 2) {
-          for (const line of raw) {
-            const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
-            output.push(` ${lineNum} ${line}`);
-            newLineNum++;
-          }
+          emitContext(raw);
         } else {
           const leading = raw.slice(0, contextLines);
           const trailing = raw.slice(raw.length - contextLines);
           const skipped = raw.length - leading.length - trailing.length;
-          for (const line of leading) {
-            const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
-            output.push(` ${lineNum} ${line}`);
-            newLineNum++;
-          }
-          output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
-          newLineNum += skipped;
-          for (const line of trailing) {
-            const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
-            output.push(` ${lineNum} ${line}`);
-            newLineNum++;
-          }
+          emitContext(leading);
+          emitEllipsis(skipped);
+          emitContext(trailing);
         }
       } else if (hasLeadingChange) {
         const shown = raw.slice(0, contextLines);
         const skipped = raw.length - shown.length;
-        for (const line of shown) {
-          const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
-          output.push(` ${lineNum} ${line}`);
-          newLineNum++;
-        }
-        if (skipped > 0) {
-          output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
-          newLineNum += skipped;
-        }
+        emitContext(shown);
+        if (skipped > 0) emitEllipsis(skipped);
       } else if (hasTrailingChange) {
         const skipped = Math.max(0, raw.length - contextLines);
-        if (skipped > 0) {
-          output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
-          newLineNum += skipped;
-        }
-        for (const line of raw.slice(skipped)) {
-          const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
-          output.push(` ${lineNum} ${line}`);
-          newLineNum++;
-        }
+        if (skipped > 0) emitEllipsis(skipped);
+        emitContext(raw.slice(skipped));
       } else {
+        oldLineNum += raw.length;
         newLineNum += raw.length;
       }
       lastWasChange = false;

package/src/renderDiff.ts

@@ -26,16 +26,21 @@ function renderAddedLine(line: string): string {
 	return `${ADDED_LINE_FG}${line}${FG_RESET}`;
 }
 
-/** Parse diff line to extract prefix, line number, and content.
- * Format: "+123 content" or "-123 content" or " 123 content" or "     ..." */
+/** Parse diff line to extract line number, marker, and content.
+ * Claude Code layout: `<gutter-space><right-aligned num><space><marker><space><content>`
+ * where the marker is "+" (added), "-" (removed) or " " (context), i.e.
+ * "  7 + content" / " 10 - content" / "  7   content". The number is
+ * right-padded, so `\s*\d+` captures the padding (kept for alignment). The
+ * collapsed ` ...` marker has no digits and falls through (returns null).
+ */
 function parseDiffLine(line: string): {
 	prefix: string;
 	lineNum: string;
 	content: string;
 } | null {
-	const match = line.match(/^([+-\s])(\s*\d*)\s(.*)$/);
+	const match = line.match(/^ (\s*\d+) ([-+ ]) (.*)$/);
 	if (!match) return null;
-	return { prefix: match[1], lineNum: match[2], content: match[3] };
+	return { prefix: match[2], lineNum: match[1], content: match[3] };
 }
 
 /** Replace tabs with spaces for consistent rendering. */
@@ -144,30 +149,30 @@ export function renderDiff(
 				result.push(
 					theme.fg(
 						"toolDiffRemoved",
-						`-${removed.lineNum} ${removedLine}`,
+						` ${removed.lineNum} - ${removedLine}`,
 					),
 				);
-				result.push(renderAddedLine(`+${added.lineNum} ${addedLine}`));
+				result.push(renderAddedLine(` ${added.lineNum} + ${addedLine}`));
 			} else {
 				// Show all removed lines first, then all added lines
 				for (const removed of removedLines) {
 					result.push(
 						theme.fg(
 							"toolDiffRemoved",
-							`-${removed.lineNum} ${replaceTabs(removed.content)}`,
+							` ${removed.lineNum} - ${replaceTabs(removed.content)}`,
 						),
 					);
 				}
 				for (const added of addedLines) {
 					result.push(
-						renderAddedLine(`+${added.lineNum} ${replaceTabs(added.content)}`),
+						renderAddedLine(` ${added.lineNum} + ${replaceTabs(added.content)}`),
 					);
 				}
 			}
 		} else if (parsed.prefix === "+") {
 			// Standalone added line
 			result.push(
-				renderAddedLine(`+${parsed.lineNum} ${replaceTabs(parsed.content)}`),
+				renderAddedLine(` ${parsed.lineNum} + ${replaceTabs(parsed.content)}`),
 			);
 			i++;
 		} else {
@@ -175,7 +180,7 @@ export function renderDiff(
 			result.push(
 				theme.fg(
 					"toolDiffContext",
-					` ${parsed.lineNum} ${replaceTabs(parsed.content)}`,
+					` ${parsed.lineNum}   ${replaceTabs(parsed.content)}`,
 				),
 			);
 			i++;