@gajae-code/coding-agent 0.18.6 → 0.18.8

package/src/hashline/recovery.ts

@@ -4,6 +4,7 @@ import type { FileReadCache, FileReadSnapshot } from "../edit/file-read-cache";
 import { getNativeDiffBindings } from "../internal/native-diff";
 import { HashlineMismatchError } from "./anchors";
 import { applyHashlineEdits, type HashlineApplyResult } from "./apply";
+import { RANGE_INTERIOR_HASH } from "./constants";
 import { computeLineHash } from "./hash";
 import type { Anchor, HashlineApplyOptions, HashlineEdit } from "./types";
 
@@ -72,15 +73,15 @@ function trimHunkToSnapshot(
  * matches, so a hunk whose old side (context + deleted lines) occurs more than
  * once in the live file could land on the wrong copy. Refuse such replays.
  */
-function everyHunkLandsUniquely(hunks: Diff.StructuredPatchHunk[], currentLines: string[]): boolean {
+function everyHunkLandsUniquely(hunks: Diff.StructuredPatchHunk[], lines: string[]): boolean {
 	for (const hunk of hunks) {
 		const oldSide = hunk.lines.filter(line => line[0] === " " || line[0] === "-").map(line => line.slice(1));
 		if (oldSide.length === 0) return false;
 		let occurrences = 0;
-		for (let start = 0; start + oldSide.length <= currentLines.length; start++) {
+		for (let start = 0; start + oldSide.length <= lines.length; start++) {
 			let matches = true;
 			for (let offset = 0; offset < oldSide.length; offset++) {
-				if (currentLines[start + offset] !== oldSide[offset]) {
+				if (lines[start + offset] !== oldSide[offset]) {
 					matches = false;
 					break;
 				}
@@ -146,10 +147,13 @@ function tryRecoverFromSnapshot(
 	// Precondition: the model's anchors must be vouched-for by the snapshot. If
 	// even one anchored line is missing from it, or its content hashes to a
 	// different value than the model supplied, refuse — any merge from here is
-	// a guess.
+	// a guess. Range interiors carry no model-supplied hash (the endpoints vouch
+	// for the range), so they only need to be present; the replayed hunk still
+	// has to match those snapshot lines exactly in the live file.
 	for (const anchor of anchors) {
 		const cachedLine = snapshot.lines.get(anchor.line);
 		if (cachedLine === undefined) return null;
+		if (anchor.hash === RANGE_INTERIOR_HASH) continue;
 		if (computeLineHash(anchor.line, cachedLine) !== anchor.hash) return null;
 	}
 
@@ -191,6 +195,11 @@ function tryRecoverFromSnapshot(
 		hunks.push(trimmed);
 	}
 	patch.hunks = hunks;
+	// Content is the only location evidence a replayed hunk carries, so it must
+	// identify one site in the authored version too. If the snapshot itself holds
+	// the hunk at more than one place, a single live match may be an unrelated
+	// identical copy left standing after the anchored copy changed out-of-band.
+	if (!everyHunkLandsUniquely(hunks, previousText.split("\n"))) return null;
 	if (!everyHunkLandsUniquely(hunks, currentText.split("\n"))) return null;
 	const merged = Diff.applyPatch(currentText, patch, { fuzzFactor: HASHLINE_RECOVERY_FUZZ_FACTOR });
 	if (typeof merged !== "string" || merged === currentText) return null;

package/src/hindsight/config.ts

@@ -62,11 +62,17 @@ function envBool(value: string | undefined): boolean | undefined {
 	return ["true", "1", "yes"].includes(value.toLowerCase());
 }
 
-/** Coerce an env var value into an int, returning undefined for non-numeric input. */
+/**
+ * Coerce an env var value into a non-negative int, returning undefined (so the
+ * settings value applies) for anything that is not plain digits. `parseInt`
+ * alone would read "5turns" as 5, "1e3" as 1 and "-3" as -3.
+ */
 function envInt(value: string | undefined): number | undefined {
 	if (value === undefined) return undefined;
-	const n = Number.parseInt(value, 10);
-	return Number.isFinite(n) ? n : undefined;
+	const trimmed = value.trim();
+	if (!/^\d+$/.test(trimmed)) return undefined;
+	const n = Number(trimmed);
+	return Number.isSafeInteger(n) ? n : undefined;
 }
 
 function envString(value: string | undefined): string | undefined {