opencode-hashline 1.2.0 → 1.3.1

package/dist/opencode-hashline.d.cts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode-ai/plugin';
-import { H as HashlineConfig } from './hashline-yhMw1Abs.cjs';
-export { a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-yhMw1Abs.cjs';
+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';
 
 /**
  * opencode-hashline — Hashline plugin for OpenCode

package/dist/opencode-hashline.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from '@opencode-ai/plugin';
-import { H as HashlineConfig } from './hashline-yhMw1Abs.js';
-export { a as HashEditInput, b as HashEditOperation, c as HashEditResult, d as HashlineInstance, R as ResolvedRange, V as VerifyHashResult } from './hashline-yhMw1Abs.js';
+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';
 
 /**
  * opencode-hashline — Hashline plugin for OpenCode

package/dist/opencode-hashline.js

@@ -3,18 +3,20 @@ import {
   createFileReadAfterHook,
   createSystemPromptHook,
   setDebug
-} from "./chunk-VPCMHCTB.js";
+} from "./chunk-VSVVWPET.js";
 import {
   HashlineCache,
+  HashlineError,
   applyHashEdit,
   getByteLength,
   resolveConfig
-} from "./chunk-I6RACR3D.js";
+} from "./chunk-GKXY5ZBM.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, 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
@@ -29,10 +31,12 @@ function createHashlineEditTool(config, cache) {
       operation: z.enum(["replace", "delete", "insert_before", "insert_after"]).describe("Edit operation"),
       startRef: z.string().describe('Start hash reference, e.g. "5:a3f" or "#HL 5:a3f|const x = 1;"'),
       endRef: z.string().optional().describe("End hash reference for range operations. Defaults to startRef when omitted."),
-      replacement: z.string().max(1e7).optional().describe("Replacement/inserted content. Required for replace/insert operations.")
+      replacement: z.string().max(1e7).optional().describe("Replacement/inserted content. Required for replace/insert operations."),
+      fileRev: z.string().optional().describe("File revision hash (8-char hex from #HL REV:<hash>). When provided, verifies the file hasn't changed before editing."),
+      safeReapply: z.boolean().optional().describe("Enable safe reapply: if a line moved, attempt to find it by content hash. Fails on ambiguous matches.")
     },
     async execute(args, context) {
-      const { path, operation, startRef, endRef, replacement } = args;
+      const { path, operation, startRef, endRef, replacement, fileRev, safeReapply } = args;
       const absPath = isAbsolute(path) ? path : resolve(context.directory, path);
       const realDirectory = realpathSync(resolve(context.directory));
       const realWorktree = realpathSync(resolve(context.worktree));
@@ -86,15 +90,21 @@ function createHashlineEditTool(config, cache) {
             operation,
             startRef,
             endRef,
-            replacement
+            replacement,
+            fileRev
           },
           current,
-          config.hashLength || void 0
+          config.hashLength || void 0,
+          safeReapply ?? config.safeReapply
         );
         nextContent = result.content;
         startLine = result.startLine;
         endLine = result.endLine;
       } catch (error) {
+        if (error instanceof HashlineError) {
+          throw new Error(`Hashline edit failed for "${displayPath}":
+${error.toDiagnostic()}`);
+        }
         const reason = error instanceof Error ? error.message : String(error);
         throw new Error(`Hashline edit failed for "${displayPath}": ${reason}`);
       }
@@ -131,6 +141,33 @@ function createHashlineEditTool(config, cache) {
 
 // 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;
@@ -159,6 +196,12 @@ function sanitizeConfig(raw) {
   if (typeof r.debug === "boolean") {
     result.debug = r.debug;
   }
+  if (typeof r.fileRev === "boolean") {
+    result.fileRev = r.fileRev;
+  }
+  if (typeof r.safeReapply === "boolean") {
+    result.safeReapply = r.safeReapply;
+  }
   return result;
 }
 function loadConfigFile(filePath) {
@@ -199,17 +242,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)
@@ -222,7 +256,7 @@ function createHashlinePlugin(userConfig) {
           const out = output;
           const hashLen = config.hashLength || 0;
           const prefix = config.prefix;
-          const { formatFileWithHashes, shouldExclude, getByteLength: getByteLength2 } = await import("./hashline-5PFAXY3H.js");
+          const { formatFileWithHashes, shouldExclude, getByteLength: getByteLength2 } = await import("./hashline-37RYBX5A.js");
           for (const p of out.parts ?? []) {
             if (p.type !== "file") continue;
             if (!p.url || !p.mime?.startsWith("text/")) continue;
@@ -252,9 +286,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 {
@@ -265,10 +297,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 {