opencode-hashline 1.1.3 → 1.3.0

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

@@ -31,6 +31,10 @@ interface HashlineConfig {
     prefix?: string | false;
     /** Enable debug logging to ~/.config/opencode/hashline-debug.log (default: false) */
     debug?: boolean;
+    /** Include file revision hash in annotations (default: true) */
+    fileRev?: boolean;
+    /** Enable safe reapply — relocate lines by hash when they move (default: false) */
+    safeReapply?: boolean;
 }
 /** Default exclude patterns */
 declare const DEFAULT_EXCLUDE_PATTERNS: string[];
@@ -45,6 +49,31 @@ declare const DEFAULT_CONFIG: Required<HashlineConfig>;
  * @param pluginConfig - optional config from plugin context (e.g. opencode.json)
  */
 declare function resolveConfig(config?: HashlineConfig, pluginConfig?: HashlineConfig): Required<HashlineConfig>;
+type HashlineErrorCode = "HASH_MISMATCH" | "FILE_REV_MISMATCH" | "AMBIGUOUS_REAPPLY" | "TARGET_OUT_OF_RANGE" | "INVALID_REF" | "INVALID_RANGE" | "MISSING_REPLACEMENT";
+interface CandidateLine {
+    lineNumber: number;
+    content: string;
+}
+declare class HashlineError extends Error {
+    readonly code: HashlineErrorCode;
+    readonly expected?: string;
+    readonly actual?: string;
+    readonly candidates?: CandidateLine[];
+    readonly hint?: string;
+    readonly lineNumber?: number;
+    readonly filePath?: string;
+    constructor(opts: {
+        code: HashlineErrorCode;
+        message: string;
+        expected?: string;
+        actual?: string;
+        candidates?: CandidateLine[];
+        hint?: string;
+        lineNumber?: number;
+        filePath?: string;
+    });
+    toDiagnostic(): string;
+}
 /**
  * Determine the appropriate hash length based on the number of lines.
  *
@@ -65,6 +94,34 @@ declare function getAdaptiveHashLength(lineCount: number): number;
  * @returns lowercase hex string of the specified length
  */
 declare function computeLineHash(idx: number, line: string, hashLen?: number): string;
+/**
+ * Compute a file-level revision hash from the entire content.
+ * Uses FNV-1a on CRLF-normalized content, returns 8-char hex (full 32 bits).
+ */
+declare function computeFileRev(content: string): string;
+/**
+ * Extract the file revision from annotated content.
+ * Looks for a line matching `<prefix>REV:<8-hex>` at the start of the content.
+ *
+ * @param annotatedContent - content with hashline annotations
+ * @param prefix - prefix string (default "#HL "), or false for legacy format
+ * @returns the revision hash string, or null if not found
+ */
+declare function extractFileRev(annotatedContent: string, prefix?: string | false): string | null;
+/**
+ * Verify that the file revision matches the current content.
+ * Throws HashlineError with code FILE_REV_MISMATCH if it doesn't match.
+ */
+declare function verifyFileRev(expectedRev: string, currentContent: string): void;
+/**
+ * Find candidate lines that match the expected hash for a given original line index.
+ * Used for safe reapply: if a line moved, find where it went.
+ *
+ * Since computeLineHash uses `${idx}:${trimmed}`, we check each line in the file
+ * computing its hash as if it were at the original index — a match means the content
+ * is the same as what was originally at that position.
+ */
+declare function findCandidateLines(originalLineNumber: number, expectedHash: string, lines: string[], hashLen?: number): CandidateLine[];
 /**
  * Format file content with hashline annotations.
  *
@@ -78,7 +135,7 @@ declare function computeLineHash(idx: number, line: string, hashLen?: number): s
  * @param prefix - prefix string (default "#HL "), or false to disable
  * @returns annotated content with hash prefixes
  */
-declare function formatFileWithHashes(content: string, hashLen?: number, prefix?: string | false): string;
+declare function formatFileWithHashes(content: string, hashLen?: number, prefix?: string | false, includeFileRev?: boolean): string;
 /**
  * Strip hashline prefixes to recover original file content.
  *
@@ -122,6 +179,7 @@ interface HashEditInput {
     startRef: string;
     endRef?: string;
     replacement?: string;
+    fileRev?: string;
 }
 /**
  * Result of applying a hash-aware edit.
@@ -151,6 +209,9 @@ interface VerifyHashResult {
     expected?: string;
     actual?: string;
     message?: string;
+    code?: HashlineErrorCode;
+    candidates?: CandidateLine[];
+    relocatedLine?: number;
 }
 /**
  * Verify that a line's hash matches the current content.
@@ -169,7 +230,7 @@ interface VerifyHashResult {
  * @param lines - optional pre-split lines array to avoid re-splitting
  * @returns verification result
  */
-declare function verifyHash(lineNumber: number, hash: string, currentContent: string, hashLen?: number, lines?: string[]): VerifyHashResult;
+declare function verifyHash(lineNumber: number, hash: string, currentContent: string, hashLen?: number, lines?: string[], safeReapply?: boolean): VerifyHashResult;
 /**
  * Result of a range resolution.
  */
@@ -189,7 +250,7 @@ interface ResolvedRange {
  * @param hashLen - override hash length (0 or undefined = use hash.length from ref)
  * @returns resolved range with line numbers and content
  */
-declare function resolveRange(startRef: string, endRef: string, content: string, hashLen?: number): ResolvedRange;
+declare function resolveRange(startRef: string, endRef: string, content: string, hashLen?: number, safeReapply?: boolean): ResolvedRange;
 /**
  * Replace a range of lines identified by hash references with new content.
  * Splits content once and reuses the lines array.
@@ -208,7 +269,7 @@ declare function replaceRange(startRef: string, endRef: string, content: string,
  * Unlike search/replace tools, this resolves references by line+hash and
  * verifies them before editing, so exact old-string matching is not required.
  */
-declare function applyHashEdit(input: HashEditInput, content: string, hashLen?: number): HashEditResult;
+declare function applyHashEdit(input: HashEditInput, content: string, hashLen?: number, safeReapply?: boolean): HashEditResult;
 /**
  * Simple LRU cache for annotated file content.
  */
@@ -268,6 +329,10 @@ interface HashlineInstance {
         hash: string;
     };
     shouldExclude: (filePath: string) => boolean;
+    computeFileRev: (content: string) => string;
+    verifyFileRev: (expectedRev: string, currentContent: string) => void;
+    extractFileRev: (annotatedContent: string) => string | null;
+    findCandidateLines: (originalLineNumber: number, expectedHash: string, lines: string[], hashLen?: number) => CandidateLine[];
 }
 /**
  * Create a Hashline instance with custom configuration.
@@ -277,4 +342,4 @@ interface HashlineInstance {
  */
 declare function createHashline(config?: HashlineConfig): HashlineInstance;
 
-export { DEFAULT_CONFIG as D, type HashlineConfig as H, type ResolvedRange as R, type VerifyHashResult as V, type HashEditInput as a, type HashEditOperation as b, type HashEditResult as c, type HashlineInstance as d, HashlineCache as e, DEFAULT_EXCLUDE_PATTERNS as f, DEFAULT_PREFIX as g, applyHashEdit as h, buildHashMap as i, computeLineHash as j, createHashline as k, formatFileWithHashes as l, getAdaptiveHashLength as m, getByteLength as n, matchesGlob as o, normalizeHashRef as p, parseHashRef as q, replaceRange as r, resolveConfig as s, resolveRange as t, shouldExclude as u, stripHashes as v, verifyHash as w };
+export { stripHashes as A, verifyFileRev as B, type CandidateLine as C, DEFAULT_CONFIG as D, verifyHash as E, type HashlineConfig as H, type ResolvedRange as R, type VerifyHashResult as V, type HashEditInput as a, type HashEditOperation as b, type HashEditResult as c, type HashlineErrorCode as d, type HashlineInstance as e, HashlineCache as f, DEFAULT_EXCLUDE_PATTERNS as g, DEFAULT_PREFIX as h, HashlineError as i, applyHashEdit as j, buildHashMap as k, computeFileRev as l, computeLineHash as m, createHashline as n, extractFileRev as o, findCandidateLines as p, formatFileWithHashes as q, getAdaptiveHashLength as r, getByteLength as s, matchesGlob as t, normalizeHashRef as u, parseHashRef as v, replaceRange as w, resolveConfig as x, resolveRange as y, shouldExclude as z };

package/dist/{hashline-5PFAXY3H.js → hashline-MGDEWZ77.js}

@@ -3,11 +3,15 @@ import {
   DEFAULT_EXCLUDE_PATTERNS,
   DEFAULT_PREFIX,
   HashlineCache,
+  HashlineError,
   applyHashEdit,
   buildHashMap,
+  computeFileRev,
   computeLineHash,
   createHashline,
   detectLineEnding,
+  extractFileRev,
+  findCandidateLines,
   formatFileWithHashes,
   getAdaptiveHashLength,
   getByteLength,
@@ -19,18 +23,23 @@ import {
   resolveRange,
   shouldExclude,
   stripHashes,
+  verifyFileRev,
   verifyHash
-} from "./chunk-I6RACR3D.js";
+} from "./chunk-DOR4YDIS.js";
 export {
   DEFAULT_CONFIG,
   DEFAULT_EXCLUDE_PATTERNS,
   DEFAULT_PREFIX,
   HashlineCache,
+  HashlineError,
   applyHashEdit,
   buildHashMap,
+  computeFileRev,
   computeLineHash,
   createHashline,
   detectLineEnding,
+  extractFileRev,
+  findCandidateLines,
   formatFileWithHashes,
   getAdaptiveHashLength,
   getByteLength,
@@ -42,5 +51,6 @@ export {
   resolveRange,
   shouldExclude,
   stripHashes,
+  verifyFileRev,
   verifyHash
 };