@agjs/tsforge 0.2.3 → 0.2.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agjs/tsforge",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "license": "MIT",
   "description": "TypeScript coding harness with a deterministic gate, stack-aware guardrails, and stream-level correction.",
   "repository": {

package/src/files/hashline-format.ts

@@ -108,3 +108,22 @@ export function isValidHash(hash: string): boolean {
 export function normalizeHash(hash: string): string {
   return hash.toUpperCase();
 }
+
+/**
+ * Extract the 4-hex hash from a raw value that may be a full `¶path#HASH` tag,
+ * a `path#HASH`, a `#HASH`, or a bare `HASH`. The model frequently pastes the
+ * whole header tag (what it saw on read) into the `hash` arg, which then fails
+ * the staleness compare against a real 4-hex hash. Returns undefined when no
+ * valid hash is present.
+ */
+export function extractHash(raw: string | undefined): string | undefined {
+  if (raw === undefined) {
+    return undefined;
+  }
+
+  const candidate = raw.includes(HL_HASH_SEP)
+    ? raw.slice(raw.lastIndexOf(HL_HASH_SEP) + 1).trim()
+    : raw.trim();
+
+  return isValidHash(candidate) ? candidate : undefined;
+}

package/src/files/hashline.ts

@@ -10,6 +10,7 @@ import {
   computeFileHash,
   parseHashHeader,
   normalizeHash,
+  HL_HEADER_SIGIL,
 } from "./hashline-format";
 
 /**
@@ -318,26 +319,35 @@ export function parseHashlineEdit(input: string): {
 
   let i = 0;
 
-  // Parse file header
-  if (i < lines.length) {
-    const headerLine = lines[i] ?? "";
-    const parsed = parseHeaderLine(headerLine, errors);
+  // The `¶path#HASH` header is OPTIONAL. The model frequently sends bare ops
+  // (`delete 79..164`) — the path is already in the tool args and the hash
+  // comes from the `hash` arg — so only treat the first line as a header when
+  // it actually looks like one (a malformed sigil header is still an error).
+  const headerLine = lines[0] ?? "";
 
-    filePath = parsed.filePath;
-    fileHash = parsed.fileHash;
+  if (headerLine.startsWith(HL_HEADER_SIGIL)) {
+    const parsed = parseHeaderLine(headerLine, errors);
 
-    if (filePath.length > 0) {
-      i++;
-    } else if (errors.length > 0) {
+    if (errors.length > 0) {
       return { filePath: "", fileHash: undefined, ops: [], errors };
-    } else if (headerLine.trim() === "") {
-      i++;
     }
+
+    filePath = parsed.filePath;
+    fileHash = parsed.fileHash;
+    i = 1;
+  } else if (headerLine.trim() === "") {
+    i = 1;
   }
 
   // Parse operations
   const ops = parseOperations(lines, i, errors);
 
+  if (ops.length === 0 && errors.length === 0) {
+    errors.push(
+      "No edit operations found. Provide replace/delete/insert ops (optionally after a ¶path#HASH header)."
+    );
+  }
+
   return { filePath, fileHash, ops, errors };
 }
 

package/src/loop/tools/edit-hashline.ts

@@ -3,6 +3,7 @@ import {
   parseHashlineEdit,
   SessionSnapshotStore,
 } from "../../files/hashline";
+import { extractHash } from "../../files/hashline-format";
 import { parseOrRepair, reject, type IToolContext } from "./tool-context";
 import { toHashlineEdit } from "../../agent";
 
@@ -50,11 +51,17 @@ export async function doHashlineEdit(
   // Ensure the store exists on the context
   ctx.snapshotStore ??= new SessionSnapshotStore();
 
+  // Hash source priority: the `¶path#HASH` header the model wrote in `input`
+  // (the format it saw on read), else the `hash` arg — tolerantly extracted so
+  // a pasted full tag (`¶path#HASH`) still yields the bare hash. Using the raw
+  // arg directly caused false stale-anchor rejections on unchanged files.
+  const fileHash = parsed.fileHash ?? extractHash(edit.hash);
+
   const result = await applyHashlineEdit(
     ctx.snapshotStore,
     ctx.cwd,
     edit.file,
-    edit.hash,
+    fileHash,
     parsed.ops
   );