opencode-hashline 1.0.2 → 1.0.4

package/dist/{chunk-IVZSANZ4.js → chunk-3AJXTHJ3.js}

@@ -111,13 +111,14 @@ function stripHashes(content, prefix) {
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   let hashLinePattern = stripRegexCache.get(escapedPrefix);
   if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
+    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
     stripRegexCache.set(escapedPrefix, hashLinePattern);
   }
   return content.split("\n").map((line) => {
     const match = line.match(hashLinePattern);
     if (match) {
-      return line.slice(match[0].length);
+      const patchMarker = match[1] || "";
+      return patchMarker + line.slice(match[0].length);
     }
     return line;
   }).join("\n");

package/dist/{chunk-VW5NAHEY.js → chunk-DUTTCCXT.js}

@@ -4,13 +4,26 @@ import {
   resolveConfig,
   shouldExclude,
   stripHashes
-} from "./chunk-IVZSANZ4.js";
+} from "./chunk-3AJXTHJ3.js";
 
 // src/hooks.ts
 import { appendFileSync } from "fs";
 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);
+    }
+    return originalAdd(value);
+  };
+  return set;
+}
 function debug(...args) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ")}
 `;
@@ -40,7 +53,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -87,7 +100,7 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
@@ -101,7 +114,7 @@ function createFileEditBeforeHook(config) {
     );
     if (!isFileEdit) return;
     if (!output.args || typeof output.args !== "object") return;
-    const contentFields = [
+    const contentFields = /* @__PURE__ */ new Set([
       "content",
       "new_content",
       "old_content",
@@ -111,13 +124,26 @@ function createFileEditBeforeHook(config) {
       "text",
       "diff",
       "patch",
-      "patchText"
-    ];
-    for (const field of contentFields) {
-      if (typeof output.args[field] === "string") {
-        output.args[field] = stripHashes(output.args[field], prefix);
+      "patchText",
+      "body"
+    ]);
+    function stripDeep(obj) {
+      for (const key of Object.keys(obj)) {
+        const val = obj[key];
+        if (typeof val === "string" && contentFields.has(key)) {
+          obj[key] = stripHashes(val, prefix);
+        } else if (Array.isArray(val)) {
+          for (const item of val) {
+            if (item && typeof item === "object" && !Array.isArray(item)) {
+              stripDeep(item);
+            }
+          }
+        } else if (val && typeof val === "object" && !Array.isArray(val)) {
+          stripDeep(val);
+        }
       }
     }
+    stripDeep(output.args);
   };
 }
 function createSystemPromptHook(config) {

package/dist/{hashline-W2FT5QN4.js → hashline-V3FR43UZ.js}

@@ -19,7 +19,7 @@ import {
   shouldExclude,
   stripHashes,
   verifyHash
-} from "./chunk-IVZSANZ4.js";
+} from "./chunk-3AJXTHJ3.js";
 export {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,

package/dist/index.cjs

@@ -123,13 +123,14 @@ function stripHashes(content, prefix) {
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   let hashLinePattern = stripRegexCache.get(escapedPrefix);
   if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
+    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
     stripRegexCache.set(escapedPrefix, hashLinePattern);
   }
   return content.split("\n").map((line) => {
     const match = line.match(hashLinePattern);
     if (match) {
-      return line.slice(match[0].length);
+      const patchMarker = match[1] || "";
+      return patchMarker + line.slice(match[0].length);
     }
     return line;
   }).join("\n");
@@ -467,6 +468,19 @@ var import_path = require("path");
 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);
+    }
+    return originalAdd(value);
+  };
+  return set;
+}
 function debug(...args) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ")}
 `;
@@ -496,7 +510,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -543,7 +557,7 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
@@ -557,7 +571,7 @@ function createFileEditBeforeHook(config) {
     );
     if (!isFileEdit) return;
     if (!output.args || typeof output.args !== "object") return;
-    const contentFields = [
+    const contentFields = /* @__PURE__ */ new Set([
       "content",
       "new_content",
       "old_content",
@@ -567,13 +581,26 @@ function createFileEditBeforeHook(config) {
       "text",
       "diff",
       "patch",
-      "patchText"
-    ];
-    for (const field of contentFields) {
-      if (typeof output.args[field] === "string") {
-        output.args[field] = stripHashes(output.args[field], prefix);
+      "patchText",
+      "body"
+    ]);
+    function stripDeep(obj) {
+      for (const key of Object.keys(obj)) {
+        const val = obj[key];
+        if (typeof val === "string" && contentFields.has(key)) {
+          obj[key] = stripHashes(val, prefix);
+        } else if (Array.isArray(val)) {
+          for (const item of val) {
+            if (item && typeof item === "object" && !Array.isArray(item)) {
+              stripDeep(item);
+            }
+          }
+        } else if (val && typeof val === "object" && !Array.isArray(val)) {
+          stripDeep(val);
+        }
       }
     }
+    stripDeep(output.args);
   };
 }
 function createSystemPromptHook(config) {
@@ -661,15 +688,21 @@ function createHashlineEditTool(config, cache) {
     async execute(args, context) {
       const { path, operation, startRef, endRef, replacement } = args;
       const absPath = (0, import_path2.isAbsolute)(path) ? path : (0, import_path2.resolve)(context.directory, path);
-      const normalizedAbs = (0, import_path2.resolve)(absPath);
-      const normalizedWorktree = (0, import_path2.resolve)(context.worktree);
-      if (normalizedAbs !== normalizedWorktree && !normalizedAbs.startsWith(normalizedWorktree + import_path2.sep)) {
+      let realAbs;
+      try {
+        realAbs = (0, import_fs2.realpathSync)(absPath);
+      } catch {
+        realAbs = (0, import_path2.resolve)(absPath);
+      }
+      const realWorktree = (0, import_fs2.realpathSync)((0, import_path2.resolve)(context.worktree));
+      if (realAbs !== realWorktree && !realAbs.startsWith(realWorktree + import_path2.sep)) {
         throw new Error(`Access denied: "${path}" resolves outside the project directory`);
       }
+      const normalizedAbs = (0, import_path2.resolve)(absPath);
       const displayPath = (0, import_path2.relative)(context.worktree, absPath) || path;
       let current;
       try {
-        current = (0, import_fs2.readFileSync)(absPath, "utf-8");
+        current = (0, import_fs2.readFileSync)(realAbs, "utf-8");
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         throw new Error(`Failed to read "${displayPath}": ${reason}`);
@@ -696,14 +729,15 @@ function createHashlineEditTool(config, cache) {
         throw new Error(`Hashline edit failed for "${displayPath}": ${reason}`);
       }
       try {
-        (0, import_fs2.writeFileSync)(absPath, nextContent, "utf-8");
+        (0, import_fs2.writeFileSync)(realAbs, nextContent, "utf-8");
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         throw new Error(`Failed to write "${displayPath}": ${reason}`);
       }
       if (cache) {
-        cache.invalidate(absPath);
+        cache.invalidate(realAbs);
         cache.invalidate(normalizedAbs);
+        cache.invalidate(absPath);
         if (path !== absPath) cache.invalidate(path);
         if (displayPath !== absPath) cache.invalidate(displayPath);
       }
@@ -751,6 +785,7 @@ function loadConfig(projectDir, userConfig) {
 function createHashlinePlugin(userConfig) {
   return async (input) => {
     const projectDir = input.directory;
+    const worktree = input.worktree;
     const fileConfig = loadConfig(projectDir, userConfig);
     const config = resolveConfig(fileConfig);
     const cache = new HashlineCache(config.cacheSize);
@@ -761,6 +796,17 @@ 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);
     return {
       tool: {
         hashline_edit: createHashlineEditTool(config, cache)
@@ -782,6 +828,17 @@ function createHashlinePlugin(userConfig) {
               filePath = (0, import_url.fileURLToPath)(p.url);
             }
             if (!filePath) continue;
+            if (worktree) {
+              try {
+                const realFile = (0, import_fs3.realpathSync)(filePath);
+                const realWorktree = (0, import_fs3.realpathSync)((0, import_path3.resolve)(worktree));
+                if (realFile !== realWorktree && !realFile.startsWith(realWorktree + import_path3.sep)) {
+                  continue;
+                }
+              } catch {
+                continue;
+              }
+            }
             if (shouldExclude2(filePath, config.exclude)) continue;
             let content;
             try {
@@ -794,6 +851,7 @@ function createHashlinePlugin(userConfig) {
             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);
               p.url = `file://${tmpPath2}`;
               writeLog(debugLog, `[${(/* @__PURE__ */ new Date()).toISOString()}] chat.message annotated (cached): ${filePath}
 `);

package/dist/index.js

@@ -2,21 +2,21 @@ import {
   createFileEditBeforeHook,
   createFileReadAfterHook,
   createSystemPromptHook
-} from "./chunk-VW5NAHEY.js";
+} from "./chunk-DUTTCCXT.js";
 import {
   HashlineCache,
   applyHashEdit,
   resolveConfig
-} from "./chunk-IVZSANZ4.js";
+} from "./chunk-3AJXTHJ3.js";
 
 // src/index.ts
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { join } from "path";
+import { readFileSync as readFileSync2, realpathSync as realpathSync2, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { join, resolve as resolve2, sep as sep2 } from "path";
 import { homedir, tmpdir } from "os";
 import { fileURLToPath } from "url";
 
 // src/hashline-tool.ts
-import { readFileSync, writeFileSync } from "fs";
+import { readFileSync, realpathSync, writeFileSync } from "fs";
 import { isAbsolute, relative, resolve, sep } from "path";
 import { z } from "zod";
 function createHashlineEditTool(config, cache) {
@@ -32,15 +32,21 @@ function createHashlineEditTool(config, cache) {
     async execute(args, context) {
       const { path, operation, startRef, endRef, replacement } = args;
       const absPath = isAbsolute(path) ? path : resolve(context.directory, path);
-      const normalizedAbs = resolve(absPath);
-      const normalizedWorktree = resolve(context.worktree);
-      if (normalizedAbs !== normalizedWorktree && !normalizedAbs.startsWith(normalizedWorktree + sep)) {
+      let realAbs;
+      try {
+        realAbs = realpathSync(absPath);
+      } catch {
+        realAbs = resolve(absPath);
+      }
+      const realWorktree = realpathSync(resolve(context.worktree));
+      if (realAbs !== realWorktree && !realAbs.startsWith(realWorktree + sep)) {
         throw new Error(`Access denied: "${path}" resolves outside the project directory`);
       }
+      const normalizedAbs = resolve(absPath);
       const displayPath = relative(context.worktree, absPath) || path;
       let current;
       try {
-        current = readFileSync(absPath, "utf-8");
+        current = readFileSync(realAbs, "utf-8");
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         throw new Error(`Failed to read "${displayPath}": ${reason}`);
@@ -67,14 +73,15 @@ function createHashlineEditTool(config, cache) {
         throw new Error(`Hashline edit failed for "${displayPath}": ${reason}`);
       }
       try {
-        writeFileSync(absPath, nextContent, "utf-8");
+        writeFileSync(realAbs, nextContent, "utf-8");
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         throw new Error(`Failed to write "${displayPath}": ${reason}`);
       }
       if (cache) {
-        cache.invalidate(absPath);
+        cache.invalidate(realAbs);
         cache.invalidate(normalizedAbs);
+        cache.invalidate(absPath);
         if (path !== absPath) cache.invalidate(path);
         if (displayPath !== absPath) cache.invalidate(displayPath);
       }
@@ -122,6 +129,7 @@ function loadConfig(projectDir, userConfig) {
 function createHashlinePlugin(userConfig) {
   return async (input) => {
     const projectDir = input.directory;
+    const worktree = input.worktree;
     const fileConfig = loadConfig(projectDir, userConfig);
     const config = resolveConfig(fileConfig);
     const cache = new HashlineCache(config.cacheSize);
@@ -132,6 +140,17 @@ 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);
     return {
       tool: {
         hashline_edit: createHashlineEditTool(config, cache)
@@ -144,7 +163,7 @@ function createHashlinePlugin(userConfig) {
           const out = output;
           const hashLen = config.hashLength || 0;
           const prefix = config.prefix;
-          const { formatFileWithHashes, shouldExclude, getByteLength } = await import("./hashline-W2FT5QN4.js");
+          const { formatFileWithHashes, shouldExclude, getByteLength } = await import("./hashline-V3FR43UZ.js");
           for (const p of out.parts ?? []) {
             if (p.type !== "file") continue;
             if (!p.url || !p.mime?.startsWith("text/")) continue;
@@ -153,6 +172,17 @@ function createHashlinePlugin(userConfig) {
               filePath = fileURLToPath(p.url);
             }
             if (!filePath) continue;
+            if (worktree) {
+              try {
+                const realFile = realpathSync2(filePath);
+                const realWorktree = realpathSync2(resolve2(worktree));
+                if (realFile !== realWorktree && !realFile.startsWith(realWorktree + sep2)) {
+                  continue;
+                }
+              } catch {
+                continue;
+              }
+            }
             if (shouldExclude(filePath, config.exclude)) continue;
             let content;
             try {
@@ -165,6 +195,7 @@ function createHashlinePlugin(userConfig) {
             if (cached) {
               const tmpPath2 = join(tmpdir(), `hashline-${p.id}.txt`);
               writeFileSync2(tmpPath2, cached, "utf-8");
+              tempFiles.add(tmpPath2);
               p.url = `file://${tmpPath2}`;
               writeLog(debugLog, `[${(/* @__PURE__ */ new Date()).toISOString()}] chat.message annotated (cached): ${filePath}
 `);

package/dist/utils.cjs

@@ -170,13 +170,14 @@ function stripHashes(content, prefix) {
   const escapedPrefix = effectivePrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   let hashLinePattern = stripRegexCache.get(escapedPrefix);
   if (!hashLinePattern) {
-    hashLinePattern = new RegExp(`^${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
+    hashLinePattern = new RegExp(`^([+ \\-])?${escapedPrefix}\\d+:[0-9a-f]{2,8}\\|`);
     stripRegexCache.set(escapedPrefix, hashLinePattern);
   }
   return content.split("\n").map((line) => {
     const match = line.match(hashLinePattern);
     if (match) {
-      return line.slice(match[0].length);
+      const patchMarker = match[1] || "";
+      return patchMarker + line.slice(match[0].length);
     }
     return line;
   }).join("\n");
@@ -451,6 +452,19 @@ var import_fs = require("fs");
 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);
+    }
+    return originalAdd(value);
+  };
+  return set;
+}
 function debug(...args) {
   const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ")}
 `;
@@ -480,7 +494,7 @@ function createFileReadAfterHook(cache, config) {
   const resolved = config ?? resolveConfig();
   const hashLen = resolved.hashLength || 0;
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     debug("tool.execute.after:", input.tool, "args:", input.args);
     if (input.callID) {
@@ -527,7 +541,7 @@ function createFileReadAfterHook(cache, config) {
 function createFileEditBeforeHook(config) {
   const resolved = config ?? resolveConfig();
   const prefix = resolved.prefix;
-  const processedCallIds = /* @__PURE__ */ new Set();
+  const processedCallIds = createBoundedSet(MAX_PROCESSED_IDS);
   return async (input, output) => {
     if (input.callID) {
       if (processedCallIds.has(input.callID)) {
@@ -541,7 +555,7 @@ function createFileEditBeforeHook(config) {
     );
     if (!isFileEdit) return;
     if (!output.args || typeof output.args !== "object") return;
-    const contentFields = [
+    const contentFields = /* @__PURE__ */ new Set([
       "content",
       "new_content",
       "old_content",
@@ -551,13 +565,26 @@ function createFileEditBeforeHook(config) {
       "text",
       "diff",
       "patch",
-      "patchText"
-    ];
-    for (const field of contentFields) {
-      if (typeof output.args[field] === "string") {
-        output.args[field] = stripHashes(output.args[field], prefix);
+      "patchText",
+      "body"
+    ]);
+    function stripDeep(obj) {
+      for (const key of Object.keys(obj)) {
+        const val = obj[key];
+        if (typeof val === "string" && contentFields.has(key)) {
+          obj[key] = stripHashes(val, prefix);
+        } else if (Array.isArray(val)) {
+          for (const item of val) {
+            if (item && typeof item === "object" && !Array.isArray(item)) {
+              stripDeep(item);
+            }
+          }
+        } else if (val && typeof val === "object" && !Array.isArray(val)) {
+          stripDeep(val);
+        }
       }
     }
+    stripDeep(output.args);
   };
 }
 function createSystemPromptHook(config) {

package/dist/utils.js

@@ -3,7 +3,7 @@ import {
   createFileReadAfterHook,
   createSystemPromptHook,
   isFileReadTool
-} from "./chunk-VW5NAHEY.js";
+} from "./chunk-DUTTCCXT.js";
 import {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,
@@ -25,7 +25,7 @@ import {
   shouldExclude,
   stripHashes,
   verifyHash
-} from "./chunk-IVZSANZ4.js";
+} from "./chunk-3AJXTHJ3.js";
 export {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,

package/package.json

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