blockpatch 1.0.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,7 +1,8 @@
 {
   "name": "blockpatch",
-  "version": "1.0.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",
   "repository": {
@@ -21,10 +22,14 @@
     "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"
@@ -34,12 +39,15 @@
     "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",
-    "prepublishOnly": "bun run typecheck && bun test && bun run build",
+    "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": "^1.3.14",
-    "@types/node": "^26.1.0",
+    "@types/node": "^20",
     "typescript": "^5.8.3"
   },
   "engines": {