opencode-hashline 1.3.0 → 1.3.2

package/README.en.md

@@ -1,5 +1,7 @@
 <div align="center">
 
+<img src="banner.jpg" alt="opencode-hashline banner" width="100%" />
+
 # 🔗 opencode-hashline
 
 **Content-addressable line hashing for precise AI code editing**
@@ -61,7 +63,6 @@ Hash length automatically adapts to file size to minimize collisions:
 
 | File Size | Hash Length | Possible Values |
 |-----------|:----------:|:---------------:|
-| ≤ 256 lines | 2 hex chars | 256 |
 | ≤ 4,096 lines | 3 hex chars | 4,096 |
 | > 4,096 lines | 4 hex chars | 65,536 |
 
@@ -94,7 +95,7 @@ Built-in LRU cache (`filePath → annotatedContent`) with configurable size (def
 Verify that a line hasn't changed since it was read — protects against race conditions:
 
 ```typescript
-import { verifyHash } from "opencode-hashline";
+import { verifyHash } from "opencode-hashline/utils";
 
 const result = verifyHash(2, "f1c", currentContent);
 if (!result.valid) {
@@ -156,7 +157,7 @@ Hash computation uses `trimEnd()` (not `trim()`), so changes to leading whitespa
 Resolve and replace ranges of lines by hash references:
 
 ```typescript
-import { resolveRange, replaceRange } from "opencode-hashline";
+import { resolveRange, replaceRange } from "opencode-hashline/utils";
 
 // Get lines between two hash references
 const range = resolveRange("1:a3f", "3:0e7", content);
@@ -174,7 +175,7 @@ const newContent = replaceRange(
 Create custom Hashline instances with specific settings:
 
 ```typescript
-import { createHashline } from "opencode-hashline";
+import { createHashline } from "opencode-hashline/utils";
 
 const hl = createHashline({
   exclude: ["**/node_modules/**", "**/*.min.js"],
@@ -194,7 +195,7 @@ const isExcluded = hl.shouldExclude("node_modules/foo.js"); // true
 | Option | Type | Default | Description |
 |--------|------|---------|-------------|
 | `exclude` | `string[]` | See below | Glob patterns for files to skip |
-| `maxFileSize` | `number` | `1_000_000` | Max file size in bytes |
+| `maxFileSize` | `number` | `1_048_576` (1 MB) | Max file size in bytes |
 | `hashLength` | `number \| undefined` | `undefined` (adaptive) | Force specific hash length |
 | `cacheSize` | `number` | `100` | Max files in LRU cache |
 | `prefix` | `string \| false` | `"#HL "` | Line prefix (`false` to disable) |
@@ -302,7 +303,7 @@ The plugin needs to determine which tools are "file-read" tools (to annotate the
 The `isFileReadTool()` function is exported for testing and advanced usage:
 
 ```typescript
-import { isFileReadTool } from "opencode-hashline";
+import { isFileReadTool } from "opencode-hashline/utils";
 
 isFileReadTool("read_file");                          // true
 isFileReadTool("mcp.read");                           // true

package/README.md

@@ -1,5 +1,7 @@
 <div align="center">
 
+<img src="banner.jpg" alt="opencode-hashline banner" width="100%" />
+
 # 🔗 opencode-hashline
 
 **Контентно-адресуемое хеширование строк для точного редактирования кода с помощью AI**
@@ -34,7 +36,7 @@ Hashline аннотирует каждую строку файла коротк
 #HL 3:0e7|}
 ```
 
-> **Примечание:** Длина хеша адаптивная — она зависит от размера файла (2 символа для ≤256 строк, 3 символа для ≤4096 строк, 4 символа для >4096 строк). В примерах ниже используются 3-символьные хеши. Префикс `#HL ` защищает от ложных срабатываний при удалении хешей и является настраиваемым.
+> **Примечание:** Длина хеша адаптивная — она зависит от размера файла (3 символа для ≤4096 строк, 4 символа для >4096 строк). Минимальная длина хеша — 3 символа. В примерах ниже используются 3-символьные хеши. Префикс `#HL ` защищает от ложных срабатываний при удалении хешей и является настраиваемым.
 
 AI-модель может ссылаться на строки по их хеш-тегам для точного редактирования:
 
@@ -61,7 +63,6 @@ Hashline адресует каждую строку уникальным хеш
 
 | Размер файла | Длина хеша | Возможных значений |
 |-------------|:----------:|:------------------:|
-| ≤ 256 строк | 2 hex-символа | 256 |
 | ≤ 4 096 строк | 3 hex-символа | 4 096 |
 | > 4 096 строк | 4 hex-символа | 65 536 |
 
@@ -94,7 +95,7 @@ const hl = createHashline({ prefix: false });
 Проверка того, что строка не изменилась с момента чтения — защита от race conditions:
 
 ```typescript
-import { verifyHash } from "opencode-hashline";
+import { verifyHash } from "opencode-hashline/utils";
 
 const result = verifyHash(2, "f1c", currentContent);
 if (!result.valid) {
@@ -156,7 +157,7 @@ const result = applyHashEdit(
 Резолвинг и замена диапазонов строк по хеш-ссылкам:
 
 ```typescript
-import { resolveRange, replaceRange } from "opencode-hashline";
+import { resolveRange, replaceRange } from "opencode-hashline/utils";
 
 // Получить строки между двумя хеш-ссылками
 const range = resolveRange("1:a3f", "3:0e7", content);
@@ -174,7 +175,7 @@ const newContent = replaceRange(
 Создание кастомных экземпляров Hashline с определёнными настройками:
 
 ```typescript
-import { createHashline } from "opencode-hashline";
+import { createHashline } from "opencode-hashline/utils";
 
 const hl = createHashline({
   exclude: ["**/node_modules/**", "**/*.min.js"],
@@ -194,7 +195,7 @@ const isExcluded = hl.shouldExclude("node_modules/foo.js"); // true
 | Параметр | Тип | По умолчанию | Описание |
 |----------|-----|:------------:|----------|
 | `exclude` | `string[]` | См. ниже | Glob-паттерны для исключения файлов |
-| `maxFileSize` | `number` | `1_000_000` | Макс. размер файла в байтах |
+| `maxFileSize` | `number` | `1_048_576` (1 МБ) | Макс. размер файла в байтах |
 | `hashLength` | `number \| undefined` | `undefined` (адаптивно) | Принудительная длина хеша |
 | `cacheSize` | `number` | `100` | Макс. файлов в LRU-кеше |
 | `prefix` | `string \| false` | `"#HL "` | Префикс строки (`false` для отключения) |

package/README.ru.md

@@ -34,7 +34,7 @@ Hashline аннотирует каждую строку файла коротк
 #HL 3:0e7|}
 ```
 
-> **Примечание:** Длина хеша адаптивная — она зависит от размера файла (2 символа для ≤256 строк, 3 символа для ≤4096 строк, 4 символа для >4096 строк). В примерах ниже используются 3-символьные хеши. Префикс `#HL ` защищает от ложных срабатываний при удалении хешей и является настраиваемым.
+> **Примечание:** Длина хеша адаптивная — она зависит от размера файла (3 символа для ≤4096 строк, 4 символа для >4096 строк). Минимальная длина хеша — 3 символа. В примерах ниже используются 3-символьные хеши. Префикс `#HL ` защищает от ложных срабатываний при удалении хешей и является настраиваемым.
 
 AI-модель может ссылаться на строки по их хеш-тегам для точного редактирования:
 
@@ -56,7 +56,6 @@ AI-модель может ссылаться на строки по их хеш
 
 | Размер файла | Длина хеша | Возможных значений |
 |-------------|:----------:|:------------------:|
-| ≤ 256 строк | 2 hex-символа | 256 |
 | ≤ 4 096 строк | 3 hex-символа | 4 096 |
 | > 4 096 строк | 4 hex-символа | 65 536 |
 
@@ -89,7 +88,7 @@ const hl = createHashline({ prefix: false });
 Проверка того, что строка не изменилась с момента чтения — защита от race conditions:
 
 ```typescript
-import { verifyHash } from "opencode-hashline";
+import { verifyHash } from "opencode-hashline/utils";
 
 const result = verifyHash(2, "f1c", currentContent);
 if (!result.valid) {
@@ -108,7 +107,7 @@ if (!result.valid) {
 Резолвинг и замена диапазонов строк по хеш-ссылкам:
 
 ```typescript
-import { resolveRange, replaceRange } from "opencode-hashline";
+import { resolveRange, replaceRange } from "opencode-hashline/utils";
 
 // Получить строки между двумя хеш-ссылками
 const range = resolveRange("1:a3f", "3:0e7", content);
@@ -126,7 +125,7 @@ const newContent = replaceRange(
 Создание кастомных экземпляров Hashline с определёнными настройками:
 
 ```typescript
-import { createHashline } from "opencode-hashline";
+import { createHashline } from "opencode-hashline/utils";
 
 const hl = createHashline({
   exclude: ["**/node_modules/**", "**/*.min.js"],
@@ -146,10 +145,12 @@ const isExcluded = hl.shouldExclude("node_modules/foo.js"); // true
 | Параметр | Тип | По умолчанию | Описание |
 |----------|-----|:------------:|----------|
 | `exclude` | `string[]` | См. ниже | Glob-паттерны для исключения файлов |
-| `maxFileSize` | `number` | `1_000_000` | Макс. размер файла в байтах |
+| `maxFileSize` | `number` | `1_048_576` (1 МБ) | Макс. размер файла в байтах |
 | `hashLength` | `number \| undefined` | `undefined` (адаптивно) | Принудительная длина хеша |
 | `cacheSize` | `number` | `100` | Макс. файлов в LRU-кеше |
 | `prefix` | `string \| false` | `"#HL "` | Префикс строки (`false` для отключения) |
+| `fileRev` | `boolean` | `true` | Включать ревизию файла (`#HL REV:...`) в аннотации |
+| `safeReapply` | `boolean` | `false` | Автоматический поиск перемещённых строк по хешу |
 
 Паттерны исключения по умолчанию: lock-файлы, `node_modules`, минифицированные файлы, бинарные файлы (изображения, шрифты, архивы и т.д.).
 

package/dist/{chunk-7KUPGN4M.js → chunk-3ED7MDEC.js}

@@ -4,7 +4,7 @@ import {
   resolveConfig,
   shouldExclude,
   stripHashes
-} from "./chunk-DOR4YDIS.js";
+} from "./chunk-C323JLG3.js";
 
 // src/hooks.ts
 import { appendFileSync } from "fs";
@@ -12,18 +12,22 @@ import { join } from "path";
 import { homedir } from "os";
 var DEBUG_LOG = join(homedir(), ".config", "opencode", "hashline-debug.log");
 var MAX_PROCESSED_IDS = 1e4;
-function createBoundedSet(maxSize) {
-  const set = /* @__PURE__ */ new Set();
-  const originalAdd = set.add.bind(set);
-  set.add = (value) => {
-    if (set.size >= maxSize) {
-      const first = set.values().next().value;
-      if (first !== void 0) set.delete(first);
+var BoundedSet = class {
+  constructor(maxSize) {
+    this.maxSize = maxSize;
+  }
+  set = /* @__PURE__ */ new Set();
+  has(value) {
+    return this.set.has(value);
+  }
+  add(value) {
+    if (this.set.size >= this.maxSize) {
+      const first = this.set.values().next().value;
+      if (first !== void 0) this.set.delete(first);
     }
-    return originalAdd(value);
-  };
-  return set;
-}
+    this.set.add(value);
+  }
+};
 var debugEnabled = false;
 function setDebug(enabled) {
   debugEnabled = enabled;
@@ -58,7 +62,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -67,6 +71,8 @@ function createFileReadAfterHook(cache, config) {
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this call");
     }
     if (!isFileReadTool(input.tool, input.args)) {
       debug("skipped: not a file-read tool");
@@ -105,13 +111,16 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
+        debug("skipped: duplicate callID (edit)", input.callID);
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this edit call");
     }
     const toolName = input.tool.toLowerCase();
     const isFileEdit = FILE_EDIT_TOOLS.some(

package/dist/{chunk-DOR4YDIS.js → chunk-C323JLG3.js}

@@ -199,23 +199,47 @@ function formatFileWithHashes(content, hashLen, prefix, includeFileRev) {
   const lines = normalized.split("\n");
   const effectiveLen = hashLen && hashLen >= 3 ? hashLen : getAdaptiveHashLength(lines.length);
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
+  const hashLens = new Array(lines.length).fill(effectiveLen);
   const hashes = new Array(lines.length);
-  const seen = /* @__PURE__ */ new Map();
-  const upgraded = /* @__PURE__ */ new Set();
   for (let idx = 0; idx < lines.length; idx++) {
-    const hash = computeLineHash(idx, lines[idx], effectiveLen);
-    if (seen.has(hash)) {
-      const longerLen = Math.min(effectiveLen + 1, 8);
-      const prevIdx = seen.get(hash);
-      if (!upgraded.has(prevIdx)) {
-        hashes[prevIdx] = computeLineHash(prevIdx, lines[prevIdx], longerLen);
-        upgraded.add(prevIdx);
+    hashes[idx] = computeLineHash(idx, lines[idx], effectiveLen);
+  }
+  let dirtyIndices = null;
+  let hasCollisions = true;
+  while (hasCollisions) {
+    hasCollisions = false;
+    const seen = /* @__PURE__ */ new Map();
+    for (let idx = 0; idx < lines.length; idx++) {
+      const h = hashes[idx];
+      const group = seen.get(h);
+      if (group) {
+        group.push(idx);
+      } else {
+        seen.set(h, [idx]);
+      }
+    }
+    const nextDirty = /* @__PURE__ */ new Set();
+    for (const [, group] of seen) {
+      if (group.length < 2) continue;
+      if (dirtyIndices !== null && !group.some((idx) => dirtyIndices.has(idx))) continue;
+      for (const idx of group) {
+        const newLen = Math.min(hashLens[idx] + 1, 8);
+        if (newLen === hashLens[idx]) continue;
+        hashLens[idx] = newLen;
+        hashes[idx] = computeLineHash(idx, lines[idx], newLen);
+        nextDirty.add(idx);
+        hasCollisions = true;
       }
-      hashes[idx] = computeLineHash(idx, lines[idx], longerLen);
-      upgraded.add(idx);
+    }
+    dirtyIndices = nextDirty;
+  }
+  const finalSeen = /* @__PURE__ */ new Map();
+  for (let idx = 0; idx < lines.length; idx++) {
+    const existing = finalSeen.get(hashes[idx]);
+    if (existing !== void 0) {
+      hashes[idx] = `${hashes[idx]}${idx.toString(16)}`;
     } else {
-      seen.set(hash, idx);
-      hashes[idx] = hash;
+      finalSeen.set(hashes[idx], idx);
     }
   }
   const annotatedLines = lines.map((line, idx) => {
@@ -231,12 +255,16 @@ var stripRegexCache = /* @__PURE__ */ new Map();
 function stripHashes(content, prefix) {
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  let hashLinePattern = stripRegexCache.get(escapedPrefix);
-  if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
-    stripRegexCache.set(escapedPrefix, hashLinePattern);
+  let cached = stripRegexCache.get(escapedPrefix);
+  if (!cached) {
+    cached = {
+      hashLine: new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`),
+      rev: new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`)
+    };
+    stripRegexCache.set(escapedPrefix, cached);
   }
-  const revPattern = new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`);
+  const hashLinePattern = cached.hashLine;
+  const revPattern = cached.rev;
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
   const result = normalized.split("\n").filter((line) => !revPattern.test(line)).map((line) => {
@@ -385,10 +413,10 @@ function resolveRange(startRef, endRef, content, hashLen, safeReapply) {
     content: rangeLines.join(lineEnding)
   };
 }
-function replaceRange(startRef, endRef, content, replacement, hashLen) {
+function replaceRange(startRef, endRef, content, replacement, hashLen, safeReapply) {
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
-  const range = resolveRange(startRef, endRef, normalized, hashLen);
+  const range = resolveRange(startRef, endRef, normalized, hashLen, safeReapply);
   const lines = normalized.split("\n");
   const before = lines.slice(0, range.startLine - 1);
   const after = lines.slice(range.endLine);
@@ -558,9 +586,8 @@ function matchesGlob(filePath, pattern) {
 function shouldExclude(filePath, patterns) {
   return patterns.some((pattern) => matchesGlob(filePath, pattern));
 }
-var textEncoder = new TextEncoder();
 function getByteLength(content) {
-  return textEncoder.encode(content).length;
+  return Buffer.byteLength(content, "utf-8");
 }
 function detectLineEnding(content) {
   return content.includes("\r\n") ? "\r\n" : "\n";

package/dist/{hashline-MGDEWZ77.js → hashline-DDPVX355.js}

@@ -25,7 +25,7 @@ import {
   stripHashes,
   verifyFileRev,
   verifyHash
-} from "./chunk-DOR4YDIS.js";
+} from "./chunk-C323JLG3.js";
 export {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,

package/dist/{hashline-A7k2yn3G.d.cts → hashline-DWndArr4.d.cts}

@@ -262,7 +262,7 @@ declare function resolveRange(startRef: string, endRef: string, content: string,
  * @param hashLen - override hash length (0 or undefined = use hash.length from ref)
  * @returns new file content with the range replaced
  */
-declare function replaceRange(startRef: string, endRef: string, content: string, replacement: string, hashLen?: number): string;
+declare function replaceRange(startRef: string, endRef: string, content: string, replacement: string, hashLen?: number, safeReapply?: boolean): string;
 /**
  * Apply a hash-aware edit operation directly against file content.
  *
@@ -308,6 +308,11 @@ declare function matchesGlob(filePath: string, pattern: string): boolean;
  * Check if a file path should be excluded based on config patterns.
  */
 declare function shouldExclude(filePath: string, patterns: string[]): boolean;
+/**
+ * Get the UTF-8 byte length of a string.
+ * Uses TextEncoder for accurate UTF-8 byte counting.
+ * This correctly handles multi-byte characters (Cyrillic, CJK, emoji, etc.).
+ */
 declare function getByteLength(content: string): number;
 /**
  * A Hashline instance with custom configuration.

package/dist/{hashline-A7k2yn3G.d.ts → hashline-DWndArr4.d.ts}

@@ -262,7 +262,7 @@ declare function resolveRange(startRef: string, endRef: string, content: string,
  * @param hashLen - override hash length (0 or undefined = use hash.length from ref)
  * @returns new file content with the range replaced
  */
-declare function replaceRange(startRef: string, endRef: string, content: string, replacement: string, hashLen?: number): string;
+declare function replaceRange(startRef: string, endRef: string, content: string, replacement: string, hashLen?: number, safeReapply?: boolean): string;
 /**
  * Apply a hash-aware edit operation directly against file content.
  *
@@ -308,6 +308,11 @@ declare function matchesGlob(filePath: string, pattern: string): boolean;
  * Check if a file path should be excluded based on config patterns.
  */
 declare function shouldExclude(filePath: string, patterns: string[]): boolean;
+/**
+ * Get the UTF-8 byte length of a string.
+ * Uses TextEncoder for accurate UTF-8 byte counting.
+ * This correctly handles multi-byte characters (Cyrillic, CJK, emoji, etc.).
+ */
 declare function getByteLength(content: string): number;
 /**
  * A Hashline instance with custom configuration.

package/dist/opencode-hashline.cjs

@@ -154,23 +154,47 @@ function formatFileWithHashes(content, hashLen, prefix, includeFileRev) {
   const lines = normalized.split("\n");
   const effectiveLen = hashLen && hashLen >= 3 ? hashLen : getAdaptiveHashLength(lines.length);
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
+  const hashLens = new Array(lines.length).fill(effectiveLen);
   const hashes = new Array(lines.length);
-  const seen = /* @__PURE__ */ new Map();
-  const upgraded = /* @__PURE__ */ new Set();
   for (let idx = 0; idx < lines.length; idx++) {
-    const hash = computeLineHash(idx, lines[idx], effectiveLen);
-    if (seen.has(hash)) {
-      const longerLen = Math.min(effectiveLen + 1, 8);
-      const prevIdx = seen.get(hash);
-      if (!upgraded.has(prevIdx)) {
-        hashes[prevIdx] = computeLineHash(prevIdx, lines[prevIdx], longerLen);
-        upgraded.add(prevIdx);
+    hashes[idx] = computeLineHash(idx, lines[idx], effectiveLen);
+  }
+  let dirtyIndices = null;
+  let hasCollisions = true;
+  while (hasCollisions) {
+    hasCollisions = false;
+    const seen = /* @__PURE__ */ new Map();
+    for (let idx = 0; idx < lines.length; idx++) {
+      const h = hashes[idx];
+      const group = seen.get(h);
+      if (group) {
+        group.push(idx);
+      } else {
+        seen.set(h, [idx]);
+      }
+    }
+    const nextDirty = /* @__PURE__ */ new Set();
+    for (const [, group] of seen) {
+      if (group.length < 2) continue;
+      if (dirtyIndices !== null && !group.some((idx) => dirtyIndices.has(idx))) continue;
+      for (const idx of group) {
+        const newLen = Math.min(hashLens[idx] + 1, 8);
+        if (newLen === hashLens[idx]) continue;
+        hashLens[idx] = newLen;
+        hashes[idx] = computeLineHash(idx, lines[idx], newLen);
+        nextDirty.add(idx);
+        hasCollisions = true;
       }
-      hashes[idx] = computeLineHash(idx, lines[idx], longerLen);
-      upgraded.add(idx);
+    }
+    dirtyIndices = nextDirty;
+  }
+  const finalSeen = /* @__PURE__ */ new Map();
+  for (let idx = 0; idx < lines.length; idx++) {
+    const existing = finalSeen.get(hashes[idx]);
+    if (existing !== void 0) {
+      hashes[idx] = `${hashes[idx]}${idx.toString(16)}`;
     } else {
-      seen.set(hash, idx);
-      hashes[idx] = hash;
+      finalSeen.set(hashes[idx], idx);
     }
   }
   const annotatedLines = lines.map((line, idx) => {
@@ -185,12 +209,16 @@ function formatFileWithHashes(content, hashLen, prefix, includeFileRev) {
 function stripHashes(content, prefix) {
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  let hashLinePattern = stripRegexCache.get(escapedPrefix);
-  if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
-    stripRegexCache.set(escapedPrefix, hashLinePattern);
+  let cached = stripRegexCache.get(escapedPrefix);
+  if (!cached) {
+    cached = {
+      hashLine: new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`),
+      rev: new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`)
+    };
+    stripRegexCache.set(escapedPrefix, cached);
   }
-  const revPattern = new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`);
+  const hashLinePattern = cached.hashLine;
+  const revPattern = cached.rev;
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
   const result = normalized.split("\n").filter((line) => !revPattern.test(line)).map((line) => {
@@ -339,10 +367,10 @@ function resolveRange(startRef, endRef, content, hashLen, safeReapply) {
     content: rangeLines.join(lineEnding)
   };
 }
-function replaceRange(startRef, endRef, content, replacement, hashLen) {
+function replaceRange(startRef, endRef, content, replacement, hashLen, safeReapply) {
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
-  const range = resolveRange(startRef, endRef, normalized, hashLen);
+  const range = resolveRange(startRef, endRef, normalized, hashLen, safeReapply);
   const lines = normalized.split("\n");
   const before = lines.slice(0, range.startLine - 1);
   const after = lines.slice(range.endLine);
@@ -453,7 +481,7 @@ function shouldExclude(filePath, patterns) {
   return patterns.some((pattern) => matchesGlob(filePath, pattern));
 }
 function getByteLength(content) {
-  return textEncoder.encode(content).length;
+  return Buffer.byteLength(content, "utf-8");
 }
 function detectLineEnding(content) {
   return content.includes("\r\n") ? "\r\n" : "\n";
@@ -521,7 +549,7 @@ function createHashline(config) {
     }
   };
 }
-var import_picomatch, DEFAULT_EXCLUDE_PATTERNS, DEFAULT_PREFIX, DEFAULT_CONFIG, HashlineError, modulusCache, stripRegexCache, HashlineCache, globMatcherCache, textEncoder;
+var import_picomatch, DEFAULT_EXCLUDE_PATTERNS, DEFAULT_PREFIX, DEFAULT_CONFIG, HashlineError, modulusCache, stripRegexCache, HashlineCache, globMatcherCache;
 var init_hashline = __esm({
   "src/hashline.ts"() {
     "use strict";
@@ -692,7 +720,6 @@ var init_hashline = __esm({
       }
     };
     globMatcherCache = /* @__PURE__ */ new Map();
-    textEncoder = new TextEncoder();
   }
 });
 
@@ -701,12 +728,14 @@ var src_exports = {};
 __export(src_exports, {
   HashlinePlugin: () => HashlinePlugin,
   createHashlinePlugin: () => createHashlinePlugin,
-  default: () => src_default
+  default: () => src_default,
+  sanitizeConfig: () => sanitizeConfig
 });
 module.exports = __toCommonJS(src_exports);
 var import_fs3 = require("fs");
 var import_path3 = require("path");
 var import_os2 = require("os");
+var import_crypto = require("crypto");
 var import_url = require("url");
 
 // src/hooks.ts
@@ -716,18 +745,22 @@ var import_os = require("os");
 init_hashline();
 var DEBUG_LOG = (0, import_path.join)((0, import_os.homedir)(), ".config", "opencode", "hashline-debug.log");
 var MAX_PROCESSED_IDS = 1e4;
-function createBoundedSet(maxSize) {
-  const set = /* @__PURE__ */ new Set();
-  const originalAdd = set.add.bind(set);
-  set.add = (value) => {
-    if (set.size >= maxSize) {
-      const first = set.values().next().value;
-      if (first !== void 0) set.delete(first);
+var BoundedSet = class {
+  constructor(maxSize) {
+    this.maxSize = maxSize;
+  }
+  set = /* @__PURE__ */ new Set();
+  has(value) {
+    return this.set.has(value);
+  }
+  add(value) {
+    if (this.set.size >= this.maxSize) {
+      const first = this.set.values().next().value;
+      if (first !== void 0) this.set.delete(first);
     }
-    return originalAdd(value);
-  };
-  return set;
-}
+    this.set.add(value);
+  }
+};
 var debugEnabled = false;
 function setDebug(enabled) {
   debugEnabled = enabled;
@@ -762,7 +795,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -771,6 +804,8 @@ function createFileReadAfterHook(cache, config) {
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this call");
     }
     if (!isFileReadTool(input.tool, input.args)) {
       debug("skipped: not a file-read tool");
@@ -809,13 +844,16 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
+        debug("skipped: duplicate callID (edit)", input.callID);
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this edit call");
     }
     const toolName = input.tool.toLowerCase();
     const isFileEdit = FILE_EDIT_TOOLS.some(
@@ -1067,14 +1105,39 @@ ${error.toDiagnostic()}`);
 
 // src/index.ts
 var CONFIG_FILENAME = "opencode-hashline.json";
+var tempDirs = /* @__PURE__ */ new Set();
+var exitListenerRegistered = false;
+function registerTempDir(dir) {
+  tempDirs.add(dir);
+  if (!exitListenerRegistered) {
+    exitListenerRegistered = true;
+    process.on("exit", () => {
+      for (const d of tempDirs) {
+        try {
+          (0, import_fs3.rmSync)(d, { recursive: true, force: true });
+        } catch {
+        }
+      }
+    });
+  }
+}
+function writeTempFile(tempDir, content) {
+  const name = `hl-${(0, import_crypto.randomBytes)(16).toString("hex")}.txt`;
+  const tmpPath = (0, import_path3.join)(tempDir, name);
+  const fd = (0, import_fs3.openSync)(tmpPath, import_fs3.constants.O_WRONLY | import_fs3.constants.O_CREAT | import_fs3.constants.O_EXCL, 384);
+  try {
+    (0, import_fs3.writeFileSync)(fd, content, "utf-8");
+  } finally {
+    (0, import_fs3.closeSync)(fd);
+  }
+  return tmpPath;
+}
 function sanitizeConfig(raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return {};
   const r = raw;
   const result = {};
   if (Array.isArray(r.exclude)) {
-    result.exclude = r.exclude.filter(
-      (p) => typeof p === "string" && p.length <= 512
-    );
+    result.exclude = r.exclude.filter((p) => typeof p === "string" && p.length <= 512).slice(0, 1e3);
   }
   if (typeof r.maxFileSize === "number" && Number.isFinite(r.maxFileSize) && r.maxFileSize >= 0) {
     result.maxFileSize = r.maxFileSize;
@@ -1126,14 +1189,13 @@ function loadConfig(projectDir, userConfig) {
 }
 function createHashlinePlugin(userConfig) {
   return async (input) => {
-    const projectDir = input.directory;
-    const worktree = input.worktree;
+    const { directory: projectDir, worktree } = input;
     const fileConfig = loadConfig(projectDir, userConfig);
     const config = resolveConfig(fileConfig);
     const cache = new HashlineCache(config.cacheSize);
     setDebug(config.debug);
-    const { appendFileSync: writeLog } = await import("fs");
     const debugLog = (0, import_path3.join)((0, import_os2.homedir)(), ".config", "opencode", "hashline-debug.log");
+    const writeLog = import_fs3.appendFileSync;
     if (config.debug) {
       try {
         writeLog(debugLog, `[${(/* @__PURE__ */ new Date()).toISOString()}] plugin loaded, prefix: ${JSON.stringify(config.prefix)}, maxFileSize: ${config.maxFileSize}, projectDir: ${projectDir}
@@ -1141,17 +1203,8 @@ function createHashlinePlugin(userConfig) {
       } catch {
       }
     }
-    const tempFiles = /* @__PURE__ */ new Set();
-    const cleanupTempFiles = () => {
-      for (const f of tempFiles) {
-        try {
-          (0, import_fs3.unlinkSync)(f);
-        } catch {
-        }
-      }
-      tempFiles.clear();
-    };
-    process.on("exit", cleanupTempFiles);
+    const instanceTmpDir = (0, import_fs3.mkdtempSync)((0, import_path3.join)((0, import_os2.tmpdir)(), "hashline-"));
+    registerTempDir(instanceTmpDir);
     return {
       tool: {
         hashline_edit: createHashlineEditTool(config, cache)
@@ -1194,9 +1247,7 @@ function createHashlinePlugin(userConfig) {
             if (config.maxFileSize > 0 && getByteLength2(content) > config.maxFileSize) continue;
             const cached = cache.get(filePath, content);
             if (cached) {
-              const tmpPath2 = (0, import_path3.join)((0, import_os2.tmpdir)(), `hashline-${p.id}.txt`);
-              (0, import_fs3.writeFileSync)(tmpPath2, cached, "utf-8");
-              tempFiles.add(tmpPath2);
+              const tmpPath2 = writeTempFile(instanceTmpDir, cached);
               p.url = `file://${tmpPath2}`;
               if (config.debug) {
                 try {
@@ -1207,10 +1258,9 @@ function createHashlinePlugin(userConfig) {
               }
               continue;
             }
-            const annotated = formatFileWithHashes2(content, hashLen || void 0, prefix);
+            const annotated = formatFileWithHashes2(content, hashLen || void 0, prefix, config.fileRev);
             cache.set(filePath, content, annotated);
-            const tmpPath = (0, import_path3.join)((0, import_os2.tmpdir)(), `hashline-${p.id}.txt`);
-            (0, import_fs3.writeFileSync)(tmpPath, annotated, "utf-8");
+            const tmpPath = writeTempFile(instanceTmpDir, annotated);
             p.url = `file://${tmpPath}`;
             if (config.debug) {
               try {
@@ -1238,5 +1288,6 @@ var src_default = HashlinePlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   HashlinePlugin,
-  createHashlinePlugin
+  createHashlinePlugin,
+  sanitizeConfig
 });

package/dist/opencode-hashline.d.cts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode-ai/plugin';
-import { H as HashlineConfig } from './hashline-A7k2yn3G.cjs';
-export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-A7k2yn3G.cjs';
+import { H as HashlineConfig } from './hashline-DWndArr4.cjs';
+export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-DWndArr4.cjs';
 
 /**
  * opencode-hashline — Hashline plugin for OpenCode
@@ -14,6 +14,13 @@ export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as Ha
  * constants, import from "opencode-hashline/utils".
  */
 
+/**
+ * Sanitize and validate a raw parsed config object.
+ * Accepts only known keys with expected types; silently drops invalid values.
+ * This prevents prototype pollution, type confusion, and prompt injection via
+ * a malicious or hand-crafted config file.
+ */
+declare function sanitizeConfig(raw: unknown): HashlineConfig;
 /**
  * Create a Hashline plugin instance with optional user configuration.
  *
@@ -45,4 +52,4 @@ declare function createHashlinePlugin(userConfig?: HashlineConfig): Plugin;
  */
 declare const HashlinePlugin: Plugin;
 
-export { HashlineConfig, HashlinePlugin, createHashlinePlugin, HashlinePlugin as default };
+export { HashlineConfig, HashlinePlugin, createHashlinePlugin, HashlinePlugin as default, sanitizeConfig };

package/dist/opencode-hashline.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode-ai/plugin';
-import { H as HashlineConfig } from './hashline-A7k2yn3G.js';
-export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-A7k2yn3G.js';
+import { H as HashlineConfig } from './hashline-DWndArr4.js';
+export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-DWndArr4.js';
 
 /**
  * opencode-hashline — Hashline plugin for OpenCode
@@ -14,6 +14,13 @@ export { C as CandidateLine, a as HashEditInput, b as HashEditOperation, c as Ha
  * constants, import from "opencode-hashline/utils".
  */
 
+/**
+ * Sanitize and validate a raw parsed config object.
+ * Accepts only known keys with expected types; silently drops invalid values.
+ * This prevents prototype pollution, type confusion, and prompt injection via
+ * a malicious or hand-crafted config file.
+ */
+declare function sanitizeConfig(raw: unknown): HashlineConfig;
 /**
  * Create a Hashline plugin instance with optional user configuration.
  *
@@ -45,4 +52,4 @@ declare function createHashlinePlugin(userConfig?: HashlineConfig): Plugin;
  */
 declare const HashlinePlugin: Plugin;
 
-export { HashlineConfig, HashlinePlugin, createHashlinePlugin, HashlinePlugin as default };
+export { HashlineConfig, HashlinePlugin, createHashlinePlugin, HashlinePlugin as default, sanitizeConfig };

package/dist/opencode-hashline.js

@@ -3,19 +3,20 @@ import {
   createFileReadAfterHook,
   createSystemPromptHook,
   setDebug
-} from "./chunk-7KUPGN4M.js";
+} from "./chunk-3ED7MDEC.js";
 import {
   HashlineCache,
   HashlineError,
   applyHashEdit,
   getByteLength,
   resolveConfig
-} from "./chunk-DOR4YDIS.js";
+} from "./chunk-C323JLG3.js";
 
 // src/index.ts
-import { readFileSync as readFileSync2, realpathSync as realpathSync2, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { readFileSync as readFileSync2, realpathSync as realpathSync2, writeFileSync as writeFileSync2, appendFileSync, mkdtempSync, openSync, closeSync, rmSync, constants as fsConstants } from "fs";
 import { join, resolve as resolve2, sep as sep2 } from "path";
 import { homedir, tmpdir } from "os";
+import { randomBytes } from "crypto";
 import { fileURLToPath } from "url";
 
 // src/hashline-tool.ts
@@ -140,14 +141,39 @@ ${error.toDiagnostic()}`);
 
 // src/index.ts
 var CONFIG_FILENAME = "opencode-hashline.json";
+var tempDirs = /* @__PURE__ */ new Set();
+var exitListenerRegistered = false;
+function registerTempDir(dir) {
+  tempDirs.add(dir);
+  if (!exitListenerRegistered) {
+    exitListenerRegistered = true;
+    process.on("exit", () => {
+      for (const d of tempDirs) {
+        try {
+          rmSync(d, { recursive: true, force: true });
+        } catch {
+        }
+      }
+    });
+  }
+}
+function writeTempFile(tempDir, content) {
+  const name = `hl-${randomBytes(16).toString("hex")}.txt`;
+  const tmpPath = join(tempDir, name);
+  const fd = openSync(tmpPath, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL, 384);
+  try {
+    writeFileSync2(fd, content, "utf-8");
+  } finally {
+    closeSync(fd);
+  }
+  return tmpPath;
+}
 function sanitizeConfig(raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return {};
   const r = raw;
   const result = {};
   if (Array.isArray(r.exclude)) {
-    result.exclude = r.exclude.filter(
-      (p) => typeof p === "string" && p.length <= 512
-    );
+    result.exclude = r.exclude.filter((p) => typeof p === "string" && p.length <= 512).slice(0, 1e3);
   }
   if (typeof r.maxFileSize === "number" && Number.isFinite(r.maxFileSize) && r.maxFileSize >= 0) {
     result.maxFileSize = r.maxFileSize;
@@ -199,14 +225,13 @@ function loadConfig(projectDir, userConfig) {
 }
 function createHashlinePlugin(userConfig) {
   return async (input) => {
-    const projectDir = input.directory;
-    const worktree = input.worktree;
+    const { directory: projectDir, worktree } = input;
     const fileConfig = loadConfig(projectDir, userConfig);
     const config = resolveConfig(fileConfig);
     const cache = new HashlineCache(config.cacheSize);
     setDebug(config.debug);
-    const { appendFileSync: writeLog } = await import("fs");
     const debugLog = join(homedir(), ".config", "opencode", "hashline-debug.log");
+    const writeLog = appendFileSync;
     if (config.debug) {
       try {
         writeLog(debugLog, `[${(/* @__PURE__ */ new Date()).toISOString()}] plugin loaded, prefix: ${JSON.stringify(config.prefix)}, maxFileSize: ${config.maxFileSize}, projectDir: ${projectDir}
@@ -214,17 +239,8 @@ function createHashlinePlugin(userConfig) {
       } catch {
       }
     }
-    const tempFiles = /* @__PURE__ */ new Set();
-    const cleanupTempFiles = () => {
-      for (const f of tempFiles) {
-        try {
-          unlinkSync(f);
-        } catch {
-        }
-      }
-      tempFiles.clear();
-    };
-    process.on("exit", cleanupTempFiles);
+    const instanceTmpDir = mkdtempSync(join(tmpdir(), "hashline-"));
+    registerTempDir(instanceTmpDir);
     return {
       tool: {
         hashline_edit: createHashlineEditTool(config, cache)
@@ -237,7 +253,7 @@ function createHashlinePlugin(userConfig) {
           const out = output;
           const hashLen = config.hashLength || 0;
           const prefix = config.prefix;
-          const { formatFileWithHashes, shouldExclude, getByteLength: getByteLength2 } = await import("./hashline-MGDEWZ77.js");
+          const { formatFileWithHashes, shouldExclude, getByteLength: getByteLength2 } = await import("./hashline-DDPVX355.js");
           for (const p of out.parts ?? []) {
             if (p.type !== "file") continue;
             if (!p.url || !p.mime?.startsWith("text/")) continue;
@@ -267,9 +283,7 @@ function createHashlinePlugin(userConfig) {
             if (config.maxFileSize > 0 && getByteLength2(content) > config.maxFileSize) continue;
             const cached = cache.get(filePath, content);
             if (cached) {
-              const tmpPath2 = join(tmpdir(), `hashline-${p.id}.txt`);
-              writeFileSync2(tmpPath2, cached, "utf-8");
-              tempFiles.add(tmpPath2);
+              const tmpPath2 = writeTempFile(instanceTmpDir, cached);
               p.url = `file://${tmpPath2}`;
               if (config.debug) {
                 try {
@@ -280,10 +294,9 @@ function createHashlinePlugin(userConfig) {
               }
               continue;
             }
-            const annotated = formatFileWithHashes(content, hashLen || void 0, prefix);
+            const annotated = formatFileWithHashes(content, hashLen || void 0, prefix, config.fileRev);
             cache.set(filePath, content, annotated);
-            const tmpPath = join(tmpdir(), `hashline-${p.id}.txt`);
-            writeFileSync2(tmpPath, annotated, "utf-8");
+            const tmpPath = writeTempFile(instanceTmpDir, annotated);
             p.url = `file://${tmpPath}`;
             if (config.debug) {
               try {
@@ -311,5 +324,6 @@ var src_default = HashlinePlugin;
 export {
   HashlinePlugin,
   createHashlinePlugin,
-  src_default as default
+  src_default as default,
+  sanitizeConfig
 };

package/dist/utils.cjs

@@ -263,23 +263,47 @@ function formatFileWithHashes(content, hashLen, prefix, includeFileRev) {
   const lines = normalized.split("\n");
   const effectiveLen = hashLen && hashLen >= 3 ? hashLen : getAdaptiveHashLength(lines.length);
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
+  const hashLens = new Array(lines.length).fill(effectiveLen);
   const hashes = new Array(lines.length);
-  const seen = /* @__PURE__ */ new Map();
-  const upgraded = /* @__PURE__ */ new Set();
   for (let idx = 0; idx < lines.length; idx++) {
-    const hash = computeLineHash(idx, lines[idx], effectiveLen);
-    if (seen.has(hash)) {
-      const longerLen = Math.min(effectiveLen + 1, 8);
-      const prevIdx = seen.get(hash);
-      if (!upgraded.has(prevIdx)) {
-        hashes[prevIdx] = computeLineHash(prevIdx, lines[prevIdx], longerLen);
-        upgraded.add(prevIdx);
+    hashes[idx] = computeLineHash(idx, lines[idx], effectiveLen);
+  }
+  let dirtyIndices = null;
+  let hasCollisions = true;
+  while (hasCollisions) {
+    hasCollisions = false;
+    const seen = /* @__PURE__ */ new Map();
+    for (let idx = 0; idx < lines.length; idx++) {
+      const h = hashes[idx];
+      const group = seen.get(h);
+      if (group) {
+        group.push(idx);
+      } else {
+        seen.set(h, [idx]);
+      }
+    }
+    const nextDirty = /* @__PURE__ */ new Set();
+    for (const [, group] of seen) {
+      if (group.length < 2) continue;
+      if (dirtyIndices !== null && !group.some((idx) => dirtyIndices.has(idx))) continue;
+      for (const idx of group) {
+        const newLen = Math.min(hashLens[idx] + 1, 8);
+        if (newLen === hashLens[idx]) continue;
+        hashLens[idx] = newLen;
+        hashes[idx] = computeLineHash(idx, lines[idx], newLen);
+        nextDirty.add(idx);
+        hasCollisions = true;
       }
-      hashes[idx] = computeLineHash(idx, lines[idx], longerLen);
-      upgraded.add(idx);
+    }
+    dirtyIndices = nextDirty;
+  }
+  const finalSeen = /* @__PURE__ */ new Map();
+  for (let idx = 0; idx < lines.length; idx++) {
+    const existing = finalSeen.get(hashes[idx]);
+    if (existing !== void 0) {
+      hashes[idx] = `${hashes[idx]}${idx.toString(16)}`;
     } else {
-      seen.set(hash, idx);
-      hashes[idx] = hash;
+      finalSeen.set(hashes[idx], idx);
     }
   }
   const annotatedLines = lines.map((line, idx) => {
@@ -295,12 +319,16 @@ var stripRegexCache = /* @__PURE__ */ new Map();
 function stripHashes(content, prefix) {
   const effectivePrefix = prefix === void 0 ? DEFAULT_PREFIX : prefix === false ? "" : prefix;
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  let hashLinePattern = stripRegexCache.get(escapedPrefix);
-  if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
-    stripRegexCache.set(escapedPrefix, hashLinePattern);
+  let cached = stripRegexCache.get(escapedPrefix);
+  if (!cached) {
+    cached = {
+      hashLine: new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`),
+      rev: new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`)
+    };
+    stripRegexCache.set(escapedPrefix, cached);
   }
-  const revPattern = new RegExp(`^${escapedPrefix}REV:[0-9a-f]{8}$`);
+  const hashLinePattern = cached.hashLine;
+  const revPattern = cached.rev;
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
   const result = normalized.split("\n").filter((line) => !revPattern.test(line)).map((line) => {
@@ -449,10 +477,10 @@ function resolveRange(startRef, endRef, content, hashLen, safeReapply) {
     content: rangeLines.join(lineEnding)
   };
 }
-function replaceRange(startRef, endRef, content, replacement, hashLen) {
+function replaceRange(startRef, endRef, content, replacement, hashLen, safeReapply) {
   const lineEnding = detectLineEnding(content);
   const normalized = lineEnding === "\r\n" ? content.replace(/\r\n/g, "\n") : content;
-  const range = resolveRange(startRef, endRef, normalized, hashLen);
+  const range = resolveRange(startRef, endRef, normalized, hashLen, safeReapply);
   const lines = normalized.split("\n");
   const before = lines.slice(0, range.startLine - 1);
   const after = lines.slice(range.endLine);
@@ -622,9 +650,8 @@ function matchesGlob(filePath, pattern) {
 function shouldExclude(filePath, patterns) {
   return patterns.some((pattern) => matchesGlob(filePath, pattern));
 }
-var textEncoder = new TextEncoder();
 function getByteLength(content) {
-  return textEncoder.encode(content).length;
+  return Buffer.byteLength(content, "utf-8");
 }
 function detectLineEnding(content) {
   return content.includes("\r\n") ? "\r\n" : "\n";
@@ -699,18 +726,22 @@ var import_path = require("path");
 var import_os = require("os");
 var DEBUG_LOG = (0, import_path.join)((0, import_os.homedir)(), ".config", "opencode", "hashline-debug.log");
 var MAX_PROCESSED_IDS = 1e4;
-function createBoundedSet(maxSize) {
-  const set = /* @__PURE__ */ new Set();
-  const originalAdd = set.add.bind(set);
-  set.add = (value) => {
-    if (set.size >= maxSize) {
-      const first = set.values().next().value;
-      if (first !== void 0) set.delete(first);
+var BoundedSet = class {
+  constructor(maxSize) {
+    this.maxSize = maxSize;
+  }
+  set = /* @__PURE__ */ new Set();
+  has(value) {
+    return this.set.has(value);
+  }
+  add(value) {
+    if (this.set.size >= this.maxSize) {
+      const first = this.set.values().next().value;
+      if (first !== void 0) this.set.delete(first);
     }
-    return originalAdd(value);
-  };
-  return set;
-}
+    this.set.add(value);
+  }
+};
 var debugEnabled = false;
 function debug(...args) {
   if (!debugEnabled) return;
@@ -742,7 +773,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -751,6 +782,8 @@ function createFileReadAfterHook(cache, config) {
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this call");
     }
     if (!isFileReadTool(input.tool, input.args)) {
       debug("skipped: not a file-read tool");
@@ -789,13 +822,16 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
+  const processedCallIds = new BoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
+        debug("skipped: duplicate callID (edit)", input.callID);
         return;
       }
       processedCallIds.add(input.callID);
+    } else {
+      debug("no callID \u2014 deduplication disabled for this edit call");
     }
     const toolName = input.tool.toLowerCase();
     const isFileEdit = FILE_EDIT_TOOLS.some(

package/dist/utils.d.cts

@@ -1,5 +1,5 @@
-import { H as HashlineConfig, f as HashlineCache } from './hashline-A7k2yn3G.cjs';
-export { C as CandidateLine, D as DEFAULT_CONFIG, g as DEFAULT_EXCLUDE_PATTERNS, h as DEFAULT_PREFIX, a as HashEditInput, b as HashEditOperation, c as HashEditResult, i as HashlineError, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult, j as applyHashEdit, k as buildHashMap, l as computeFileRev, m as computeLineHash, n as createHashline, o as extractFileRev, p as findCandidateLines, q as formatFileWithHashes, r as getAdaptiveHashLength, s as getByteLength, t as matchesGlob, u as normalizeHashRef, v as parseHashRef, w as replaceRange, x as resolveConfig, y as resolveRange, z as shouldExclude, A as stripHashes, B as verifyFileRev, E as verifyHash } from './hashline-A7k2yn3G.cjs';
+import { H as HashlineConfig, f as HashlineCache } from './hashline-DWndArr4.cjs';
+export { C as CandidateLine, D as DEFAULT_CONFIG, g as DEFAULT_EXCLUDE_PATTERNS, h as DEFAULT_PREFIX, a as HashEditInput, b as HashEditOperation, c as HashEditResult, i as HashlineError, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult, j as applyHashEdit, k as buildHashMap, l as computeFileRev, m as computeLineHash, n as createHashline, o as extractFileRev, p as findCandidateLines, q as formatFileWithHashes, r as getAdaptiveHashLength, s as getByteLength, t as matchesGlob, u as normalizeHashRef, v as parseHashRef, w as replaceRange, x as resolveConfig, y as resolveRange, z as shouldExclude, A as stripHashes, B as verifyFileRev, E as verifyHash } from './hashline-DWndArr4.cjs';
 import { Hooks } from '@opencode-ai/plugin';
 
 /**

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { H as HashlineConfig, f as HashlineCache } from './hashline-A7k2yn3G.js';
-export { C as CandidateLine, D as DEFAULT_CONFIG, g as DEFAULT_EXCLUDE_PATTERNS, h as DEFAULT_PREFIX, a as HashEditInput, b as HashEditOperation, c as HashEditResult, i as HashlineError, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult, j as applyHashEdit, k as buildHashMap, l as computeFileRev, m as computeLineHash, n as createHashline, o as extractFileRev, p as findCandidateLines, q as formatFileWithHashes, r as getAdaptiveHashLength, s as getByteLength, t as matchesGlob, u as normalizeHashRef, v as parseHashRef, w as replaceRange, x as resolveConfig, y as resolveRange, z as shouldExclude, A as stripHashes, B as verifyFileRev, E as verifyHash } from './hashline-A7k2yn3G.js';
+import { H as HashlineConfig, f as HashlineCache } from './hashline-DWndArr4.js';
+export { C as CandidateLine, D as DEFAULT_CONFIG, g as DEFAULT_EXCLUDE_PATTERNS, h as DEFAULT_PREFIX, a as HashEditInput, b as HashEditOperation, c as HashEditResult, i as HashlineError, d as HashlineErrorCode, e as HashlineInstance, R as ResolvedRange, V as VerifyHashResult, j as applyHashEdit, k as buildHashMap, l as computeFileRev, m as computeLineHash, n as createHashline, o as extractFileRev, p as findCandidateLines, q as formatFileWithHashes, r as getAdaptiveHashLength, s as getByteLength, t as matchesGlob, u as normalizeHashRef, v as parseHashRef, w as replaceRange, x as resolveConfig, y as resolveRange, z as shouldExclude, A as stripHashes, B as verifyFileRev, E as verifyHash } from './hashline-DWndArr4.js';
 import { Hooks } from '@opencode-ai/plugin';
 
 /**

package/dist/utils.js

@@ -3,7 +3,7 @@ import {
   createFileReadAfterHook,
   createSystemPromptHook,
   isFileReadTool
-} from "./chunk-7KUPGN4M.js";
+} from "./chunk-3ED7MDEC.js";
 import {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,
@@ -30,7 +30,7 @@ import {
   stripHashes,
   verifyFileRev,
   verifyHash
-} from "./chunk-DOR4YDIS.js";
+} from "./chunk-C323JLG3.js";
 export {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-hashline",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Hashline plugin for OpenCode — content-addressable line hashing for precise AI code editing",
   "main": "dist/opencode-hashline.cjs",
   "module": "dist/opencode-hashline.js",