blockpatch 0.1.0 → 1.1.0

package/examples/create-file/patch.blockpatch

@@ -0,0 +1,8 @@
+diff --blockpatch /dev/null b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=072a398e62ad50e40613b98e57f3e3236a471dcbd7c2b9f190440c22adc16a0f
+--- /dev/null
++++ b/file.txt
+
+@@ -0,0 +1,1 @@ blockpatch-target id=move-1
++created file

package/examples/create-file/work/.gitkeep

@@ -0,0 +1 @@
+This directory is intentionally empty before applying the patch.

package/examples/cross-file-relocation/README.md

@@ -0,0 +1,10 @@
+# Cross-File Relocation
+
+Moves `movedThing` from `source.txt` to `target.txt`. Cross-file relocations use two sections tied by the same move id and payload hash.
+
+```sh
+blockpatch check patch.blockpatch -d work
+blockpatch apply patch.blockpatch -d work
+diff -u expected/source.txt work/source.txt
+diff -u expected/target.txt work/target.txt
+```

package/examples/cross-file-relocation/expected/source.txt

@@ -0,0 +1,2 @@
+alpha()
+omega()

package/examples/cross-file-relocation/expected/target.txt

@@ -0,0 +1,6 @@
+class Target {
+  method() {}
+function movedThing() {
+  return 42;
+}
+}

package/examples/cross-file-relocation/patch.blockpatch

@@ -0,0 +1,26 @@
+diff --blockpatch a/source.txt b/source.txt
+blockpatch version 1
+blockpatch move id=move-1 role=source payload-sha256=a990c0da5571138b0e2363af883a399fe214a137ad809c67f6530c618967a4e6
+--- a/source.txt
++++ b/source.txt
+
+@@ -1,5 +1,2 @@ blockpatch-source id=move-1
+ alpha()
+-function movedThing() {
+-  return 42;
+-}
+ omega()
+
+diff --blockpatch a/target.txt b/target.txt
+blockpatch version 1
+blockpatch move id=move-1 role=target payload-sha256=a990c0da5571138b0e2363af883a399fe214a137ad809c67f6530c618967a4e6
+--- a/target.txt
++++ b/target.txt
+
+@@ -1,3 +1,6 @@ blockpatch-target id=move-1
+ class Target {
+   method() {}
++function movedThing() {
++  return 42;
++}
+ }

package/examples/cross-file-relocation/work/source.txt

@@ -0,0 +1,5 @@
+alpha()
+function movedThing() {
+  return 42;
+}
+omega()

package/examples/cross-file-relocation/work/target.txt

@@ -0,0 +1,3 @@
+class Target {
+  method() {}
+}

package/examples/delete-existing-file/README.md

@@ -0,0 +1,9 @@
+# Delete Existing File
+
+Deletes a patch-carried payload from an existing file with a source-only hunk.
+
+```sh
+blockpatch check patch.blockpatch -d work
+blockpatch apply patch.blockpatch -d work
+diff -u expected/file.txt work/file.txt
+```

package/examples/delete-existing-file/expected/file.txt

@@ -0,0 +1,2 @@
+alpha
+omega

package/examples/delete-existing-file/patch.blockpatch

@@ -0,0 +1,10 @@
+diff --blockpatch a/file.txt b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=5dbe6af8d3a2a31f6696ebdae9e590977a19b827ec8e0a22ea1e3decf1a79b77
+--- a/file.txt
++++ b/file.txt
+
+@@ -1,3 +1,2 @@ blockpatch-source id=move-1
+ alpha
+-remove me
+ omega

package/examples/delete-existing-file/work/file.txt

@@ -0,0 +1,3 @@
+alpha
+remove me
+omega

package/examples/failure-ambiguous-target/README.md

@@ -0,0 +1,9 @@
+# Failure: Ambiguous Target
+
+Demonstrates strict target matching. The target anchor appears twice, so `blockpatch` refuses to guess.
+
+```sh
+blockpatch check patch.blockpatch -d work
+```
+
+Expected error: `Target anchor is ambiguous`.

package/examples/failure-ambiguous-target/patch.blockpatch

@@ -0,0 +1,14 @@
+diff --blockpatch a/file.txt b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=f721166071c491fd38ac82a8432ecc349f39f537a969054ab2c8d3175c731e7e
+--- a/file.txt
++++ b/file.txt
+
+@@ -1,3 +1,2 @@ blockpatch-source id=move-1
+ alpha
+-move me
+ omega
+
+@@ -4,1 +4,2 @@ blockpatch-target id=move-1
+ target
++move me

package/examples/failure-ambiguous-target/work/file.txt

@@ -0,0 +1,5 @@
+alpha
+move me
+omega
+target
+target

package/examples/insert-existing-file/README.md

@@ -0,0 +1,9 @@
+# Insert Existing File
+
+Inserts a patch-carried payload into an existing file with a target-only hunk.
+
+```sh
+blockpatch check patch.blockpatch -d work
+blockpatch apply patch.blockpatch -d work
+diff -u expected/file.txt work/file.txt
+```

package/examples/insert-existing-file/expected/file.txt

@@ -0,0 +1,3 @@
+alpha
+inserted line
+omega

package/examples/insert-existing-file/patch.blockpatch

@@ -0,0 +1,10 @@
+diff --blockpatch a/file.txt b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=cbfeef0cd60ab2c01e036d23082a1f19ea3f5153d9cffde8790ad0152a3830f5
+--- a/file.txt
++++ b/file.txt
+
+@@ -1,2 +1,3 @@ blockpatch-target id=move-1
+ alpha
++inserted line
+ omega

package/examples/insert-existing-file/work/file.txt

@@ -0,0 +1,2 @@
+alpha
+omega

package/examples/remove-file/README.md

@@ -0,0 +1,9 @@
+# Remove File
+
+Removes `file.txt` with a whole-file `file -> /dev/null` patch.
+
+```sh
+blockpatch check patch.blockpatch -d work
+blockpatch apply patch.blockpatch -d work
+test ! -e work/file.txt
+```

package/examples/remove-file/expected/.gitkeep

@@ -0,0 +1 @@
+After applying the patch, file.txt should not exist.

package/examples/remove-file/patch.blockpatch

@@ -0,0 +1,8 @@
+diff --blockpatch a/file.txt /dev/null
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=4da5a83256114db88b111676cf3b2f4a04f202d3d7fc99417cac1ba5145713e2
+--- a/file.txt
++++ /dev/null
+
+@@ -1,1 +0,0 @@ blockpatch-source id=move-1
+-obsolete file

package/examples/remove-file/work/file.txt

@@ -0,0 +1 @@
+obsolete file

package/examples/reverse/README.md

@@ -0,0 +1,9 @@
+# Reverse
+
+Applies the same relocation patch in reverse. The `work/` tree starts in the already-applied state and `-R` restores the original ordering.
+
+```sh
+blockpatch check -R patch.blockpatch -d work
+blockpatch apply -R patch.blockpatch -d work
+diff -u expected/file.txt work/file.txt
+```

package/examples/reverse/expected/file.txt

@@ -0,0 +1,4 @@
+alpha
+move me
+omega
+target

package/examples/reverse/patch.blockpatch

@@ -0,0 +1,14 @@
+diff --blockpatch a/file.txt b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=f721166071c491fd38ac82a8432ecc349f39f537a969054ab2c8d3175c731e7e
+--- a/file.txt
++++ b/file.txt
+
+@@ -1,3 +1,2 @@ blockpatch-source id=move-1
+ alpha
+-move me
+ omega
+
+@@ -4,1 +4,2 @@ blockpatch-target id=move-1
+ target
++move me

package/examples/reverse/work/file.txt

@@ -0,0 +1,4 @@
+alpha
+omega
+target
+move me

package/examples/same-file-relocation/README.md

@@ -0,0 +1,9 @@
+# Same-File Relocation
+
+Moves `move me` from between `alpha` and `omega` to after `target` in the same file.
+
+```sh
+blockpatch check patch.blockpatch -d work
+blockpatch apply patch.blockpatch -d work
+diff -u expected/file.txt work/file.txt
+```

package/examples/same-file-relocation/expected/file.txt

@@ -0,0 +1,4 @@
+alpha
+omega
+target
+move me

package/examples/same-file-relocation/patch.blockpatch

@@ -0,0 +1,14 @@
+diff --blockpatch a/file.txt b/file.txt
+blockpatch version 1
+blockpatch move id=move-1 payload-sha256=f721166071c491fd38ac82a8432ecc349f39f537a969054ab2c8d3175c731e7e
+--- a/file.txt
++++ b/file.txt
+
+@@ -1,3 +1,2 @@ blockpatch-source id=move-1
+ alpha
+-move me
+ omega
+
+@@ -4,1 +4,2 @@ blockpatch-target id=move-1
+ target
++move me

package/examples/same-file-relocation/work/file.txt

@@ -0,0 +1,4 @@
+alpha
+move me
+omega
+target

package/package.json

@@ -1,33 +1,53 @@
 {
   "name": "blockpatch",
-  "version": "0.1.0",
-  "description": "Anchored text block relocation patches",
+  "version": "1.1.0",
+  "description": "Hash-verified, reviewable block-move patches for coding agents",
+  "packageManager": "bun@1.3.14",
   "type": "module",
   "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    }
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cheese-melted/blockpatch.git"
   },
+  "bugs": {
+    "url": "https://github.com/cheese-melted/blockpatch/issues"
+  },
+  "homepage": "https://github.com/cheese-melted/blockpatch#readme",
+  "keywords": [
+    "patch",
+    "diff",
+    "refactor",
+    "codemod",
+    "text",
+    "agent"
+  ],
   "bin": {
-    "blockpatch": "dist/cli.js"
+    "blockpatch": "dist/cli.js",
+    "blockpatch-conformance": "conformance/runner.mjs"
   },
   "files": [
     "dist",
+    "docs",
+    "examples",
+    "conformance",
     "README.md",
+    "CONTRIBUTING.md",
     "LICENSE"
   ],
   "scripts": {
     "test": "bun test",
-    "build": "bun build ./src/cli.ts ./src/index.ts --target=node --outdir=dist && tsc -p tsconfig.build.json",
-    "prepublishOnly": "bun test && bun run build",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "build": "node -e \"fs.rmSync('dist', { recursive: true, force: true })\" && bun build ./src/cli.ts --target=node --outdir=dist",
+    "smoke:dist": "node test/built-cli-smoke.mjs",
+    "smoke:pack": "node test/packed-cli-smoke.mjs",
+    "conformance": "node conformance/runner.mjs node dist/cli.js",
+    "prepublishOnly": "bun run typecheck && bun test && bun run build && npm run smoke:dist && npm run smoke:pack",
+    "pack:dry": "npm pack --dry-run",
     "publish:dry": "npm publish --dry-run"
   },
   "devDependencies": {
-    "@types/bun": "latest",
+    "@types/bun": "^1.3.14",
+    "@types/node": "^20",
     "typescript": "^5.8.3"
   },
   "engines": {

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/engine.d.ts

@@ -1,19 +0,0 @@
-import type { ApplyOptions, ApplyResult, BlockPatch } from "./types";
-interface ByteRange {
-    start: number;
-    end: number;
-}
-interface TargetSelection {
-    range: ByteRange;
-    insertIndex: number;
-}
-interface MoveSelection {
-    source: ByteRange;
-    target: TargetSelection;
-    payload: Buffer;
-}
-export declare function checkPatchFile(patchPath: string, options?: ApplyOptions): Promise<ApplyResult>;
-export declare function applyPatchFile(patchPath: string, options?: ApplyOptions): Promise<ApplyResult>;
-export declare function selectMove(file: Buffer, patch: BlockPatch): MoveSelection;
-export declare function applyMove(file: Buffer, selection: MoveSelection): Buffer;
-export {};

package/dist/errors.d.ts

@@ -1,5 +0,0 @@
-export declare class BlockPatchError extends Error {
-    readonly code: string;
-    constructor(code: string, message: string);
-}
-export declare function fail(code: string, message: string): never;

package/dist/index.d.ts

@@ -1,4 +0,0 @@
-export { applyMove, applyPatchFile, checkPatchFile, selectMove } from "./engine";
-export { BlockPatchError } from "./errors";
-export { parseBlockPatch } from "./parser";
-export type { ApplyOptions, ApplyResult, BlockPatch, TargetAnchor, TargetKind } from "./types";

package/dist/index.js

@@ -1,263 +0,0 @@
-// src/engine.ts
-import { randomBytes } from "node:crypto";
-import { chmod, readFile, rename, stat, unlink, writeFile } from "node:fs/promises";
-import { basename, dirname, join, resolve } from "node:path";
-
-// src/errors.ts
-class BlockPatchError extends Error {
-  code;
-  constructor(code, message) {
-    super(message);
-    this.name = "BlockPatchError";
-    this.code = code;
-  }
-}
-function fail(code, message) {
-  throw new BlockPatchError(code, message);
-}
-
-// src/parser.ts
-var beginLine = "*** Begin BlockPatch";
-var sourceBeforeLine = "*** Source Before";
-var sourcePayloadLine = "*** Source Payload";
-var sourceAfterLine = "*** Source After";
-var targetBeforeLine = "*** Target Before";
-var targetAfterLine = "*** Target After";
-var endLine = "*** End BlockPatch";
-var moveFilePrefix = "*** Move File: ";
-function parseBlockPatch(input) {
-  const markers = collectMarkers(input);
-  const sequence = markers.map((marker) => marker.name);
-  const targetIndex = sequence.findIndex((name) => name === "targetBefore" || name === "targetAfter");
-  if (targetIndex === -1) {
-    fail("parse_error", "Patch must contain *** Target Before or *** Target After");
-  }
-  const expectedPrefix = ["begin", "moveFile", "sourceBefore", "sourcePayload", "sourceAfter"];
-  const expectedSuffix = ["end"];
-  const expected = [...expectedPrefix, sequence[targetIndex], ...expectedSuffix];
-  if (sequence.length !== expected.length || sequence.some((name, index) => name !== expected[index])) {
-    fail("parse_error", "Patch markers must appear in the v0 order");
-  }
-  const moveFile = markers[1];
-  const path = moveFile.value?.trim();
-  if (!path) {
-    fail("parse_error", "*** Move File must include a path");
-  }
-  const sourceBefore = section(input, markers[2], markers[3]);
-  const sourcePayload = section(input, markers[3], markers[4]);
-  const sourceAfter = section(input, markers[4], markers[5]);
-  const targetAnchor = section(input, markers[5], markers[6]);
-  const target = {
-    kind: markers[5].name === "targetBefore" ? "before" : "after",
-    anchor: targetAnchor
-  };
-  if (sourceBefore.length === 0) {
-    fail("parse_error", "*** Source Before must not be empty");
-  }
-  if (sourcePayload.length === 0) {
-    fail("parse_error", "*** Source Payload must not be empty");
-  }
-  if (sourceAfter.length === 0) {
-    fail("parse_error", "*** Source After must not be empty");
-  }
-  if (target.anchor.length === 0) {
-    fail("parse_error", "*** Target Before/After must not be empty");
-  }
-  return {
-    type: "move",
-    path,
-    sourceBefore,
-    sourcePayload,
-    sourceAfter,
-    target
-  };
-}
-function collectMarkers(input) {
-  const markers = [];
-  let position = 0;
-  while (position <= input.length) {
-    const lineStart = position;
-    const lf = input.indexOf(10, position);
-    const lineEnd = lf === -1 ? input.length : lf;
-    const contentStart = lf === -1 ? input.length : lf + 1;
-    const textEnd = lineEnd > lineStart && input[lineEnd - 1] === 13 ? lineEnd - 1 : lineEnd;
-    const line = input.subarray(lineStart, textEnd).toString("utf8");
-    const marker = markerForLine(line, lineStart, contentStart);
-    if (marker !== undefined) {
-      markers.push(marker);
-    }
-    if (lf === -1) {
-      break;
-    }
-    position = lf + 1;
-  }
-  if (markers.length === 0) {
-    fail("parse_error", "Patch does not contain BlockPatch markers");
-  }
-  return markers;
-}
-function markerForLine(line, lineStart, contentStart) {
-  if (line === beginLine)
-    return { name: "begin", lineStart, contentStart };
-  if (line.startsWith(moveFilePrefix)) {
-    return { name: "moveFile", value: line.slice(moveFilePrefix.length), lineStart, contentStart };
-  }
-  if (line === sourceBeforeLine)
-    return { name: "sourceBefore", lineStart, contentStart };
-  if (line === sourcePayloadLine)
-    return { name: "sourcePayload", lineStart, contentStart };
-  if (line === sourceAfterLine)
-    return { name: "sourceAfter", lineStart, contentStart };
-  if (line === targetBeforeLine)
-    return { name: "targetBefore", lineStart, contentStart };
-  if (line === targetAfterLine)
-    return { name: "targetAfter", lineStart, contentStart };
-  if (line === endLine)
-    return { name: "end", lineStart, contentStart };
-  return;
-}
-function section(input, marker, nextMarker) {
-  let end = nextMarker.lineStart;
-  if (end > marker.contentStart && input[end - 1] === 10) {
-    end -= 1;
-    if (end > marker.contentStart && input[end - 1] === 13) {
-      end -= 1;
-    }
-  }
-  return Buffer.from(input.subarray(marker.contentStart, end));
-}
-
-// src/engine.ts
-async function checkPatchFile(patchPath, options = {}) {
-  return runPatchFile(patchPath, { ...options, dryRun: true });
-}
-async function applyPatchFile(patchPath, options = {}) {
-  return runPatchFile(patchPath, options);
-}
-async function runPatchFile(patchPath, options) {
-  const cwd = options.cwd ?? process.cwd();
-  const patchBytes = await readFile(resolve(cwd, patchPath));
-  const patch = parseBlockPatch(patchBytes);
-  const changedPath = await applyMovePatch(patch, cwd, options.dryRun ?? false);
-  return { changed: [changedPath] };
-}
-async function applyMovePatch(patch, cwd, dryRun) {
-  const absolutePath = resolve(cwd, patch.path);
-  const original = await readFile(absolutePath);
-  const selection = selectMove(original, patch);
-  const next = applyMove(original, selection);
-  if (!dryRun && !next.equals(original)) {
-    await writeAtomic(absolutePath, next);
-  }
-  return patch.path;
-}
-function selectMove(file, patch) {
-  const source = findSourceRange(file, patch);
-  const target = findTarget(file, patch);
-  if (rangesOverlap(source, target.range)) {
-    fail("target_overlaps_source", `Target anchor for ${patch.path} overlaps the source block`);
-  }
-  return {
-    source,
-    target,
-    payload: Buffer.from(file.subarray(source.start, source.end))
-  };
-}
-function applyMove(file, selection) {
-  const withoutSource = Buffer.concat([
-    file.subarray(0, selection.source.start),
-    file.subarray(selection.source.end)
-  ]);
-  const targetIndex = selection.target.insertIndex > selection.source.end ? selection.target.insertIndex - selection.payload.length : selection.target.insertIndex;
-  return Buffer.concat([
-    withoutSource.subarray(0, targetIndex),
-    selection.payload,
-    withoutSource.subarray(targetIndex)
-  ]);
-}
-function findSourceRange(file, patch) {
-  const fullSource = Buffer.concat([patch.sourceBefore, patch.sourcePayload, patch.sourceAfter]);
-  const fullMatches = indexesOf(file, fullSource);
-  if (fullMatches.length === 1) {
-    const start = fullMatches[0] + patch.sourceBefore.length;
-    return { start, end: start + patch.sourcePayload.length };
-  }
-  if (fullMatches.length > 1) {
-    fail("source_ambiguous", `Source block is ambiguous in ${patch.path}; matched ${fullMatches.length} locations`);
-  }
-  const envelopes = findSourceEnvelopes(file, patch);
-  if (envelopes.length === 1) {
-    fail("payload_mismatch", `Source payload does not match located source anchors in ${patch.path}`);
-  }
-  if (envelopes.length > 1) {
-    fail("source_ambiguous", `Source anchors are ambiguous in ${patch.path}; matched ${envelopes.length} locations`);
-  }
-  fail("source_not_found", `Source anchors were not found in ${patch.path}`);
-}
-function findSourceEnvelopes(file, patch) {
-  const beforeMatches = indexesOf(file, patch.sourceBefore);
-  const afterMatches = indexesOf(file, patch.sourceAfter);
-  const ranges = [];
-  for (const beforeStart of beforeMatches) {
-    const payloadStart = beforeStart + patch.sourceBefore.length;
-    const afterStart = afterMatches.find((candidate) => candidate >= payloadStart);
-    if (afterStart !== undefined) {
-      ranges.push({ start: payloadStart, end: afterStart });
-    }
-  }
-  return ranges;
-}
-function findTarget(file, patch) {
-  const matches = indexesOf(file, patch.target.anchor);
-  if (matches.length === 0) {
-    fail("target_not_found", `Target anchor was not found in ${patch.path}`);
-  }
-  if (matches.length > 1) {
-    fail("target_ambiguous", `Target anchor is ambiguous in ${patch.path}; matched ${matches.length} locations`);
-  }
-  const start = matches[0];
-  const end = start + patch.target.anchor.length;
-  return {
-    range: { start, end },
-    insertIndex: patch.target.kind === "before" ? start : end
-  };
-}
-function indexesOf(haystack, needle) {
-  if (needle.length === 0) {
-    return [];
-  }
-  const indexes = [];
-  let index = haystack.indexOf(needle);
-  while (index !== -1) {
-    indexes.push(index);
-    index = haystack.indexOf(needle, index + 1);
-  }
-  return indexes;
-}
-function rangesOverlap(left, right) {
-  return left.start < right.end && right.start < left.end;
-}
-async function writeAtomic(path, bytes) {
-  const info = await stat(path);
-  const dir = dirname(path);
-  const base = basename(path);
-  const temp = join(dir, `.${base}.${process.pid}.${randomBytes(8).toString("hex")}.tmp`);
-  try {
-    await writeFile(temp, bytes, { flag: "wx" });
-    await chmod(temp, info.mode);
-    await rename(temp, path);
-  } catch (error) {
-    await unlink(temp).catch(() => {
-      return;
-    });
-    throw error;
-  }
-}
-export {
-  selectMove,
-  parseBlockPatch,
-  checkPatchFile,
-  applyPatchFile,
-  applyMove,
-  BlockPatchError
-};

package/dist/parser.d.ts

@@ -1,2 +0,0 @@
-import type { BlockPatch } from "./types";
-export declare function parseBlockPatch(input: Buffer): BlockPatch;

package/dist/types.d.ts

@@ -1,20 +0,0 @@
-export type TargetKind = "before" | "after";
-export interface BlockPatch {
-    type: "move";
-    path: string;
-    sourceBefore: Buffer;
-    sourcePayload: Buffer;
-    sourceAfter: Buffer;
-    target: TargetAnchor;
-}
-export interface TargetAnchor {
-    kind: TargetKind;
-    anchor: Buffer;
-}
-export interface ApplyOptions {
-    cwd?: string;
-    dryRun?: boolean;
-}
-export interface ApplyResult {
-    changed: string[];
-}