elias/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(hashline-edit): stabilize hashes and tighten prefix stripping

Browse Source 
Switch line hashing to significance-aware seeding so meaningful lines stay stable across reflows while punctuation-only lines still disambiguate by line index.

Also narrow prefix stripping to hashline/diff patterns that reduce accidental content corruption during edit normalization.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
YeonGyu-Kim 2026-02-23 18:51:25 +09:00
parent afec1f2928
commit ab768029fa
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/hashline-edit/edit-text-normalization.ts
View File

@ -1,5 +1,5 @@
const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*\d+#[A-Z]{2}:/
const DIFF_PLUS_RE = /^[+-](?![+-])/
const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*\d+\s*#\s*[ZPMQVRWSNKTXJBYH]{2}:/
const DIFF_PLUS_RE = /^[+](?![+])/
function equalsIgnoringWhitespace(a: string, b: string): boolean {
if (a === b) return true

14
src/tools/hashline-edit/hash-computation.test.ts
View File

@ -21,7 +21,7 @@ describe("computeLineHash", () => {
expect(hash1).toMatch(/^[ZPMQVRWSNKTXJBYH]{2}$/)
})
it("produces different hashes for same content on different lines", () => {
it("produces same hashes for significant content on different lines", () => {
//#given
const content = "function hello() {"
@ -29,6 +29,18 @@ describe("computeLineHash", () => {
const hash1 = computeLineHash(1, content)
const hash2 = computeLineHash(2, content)
//#then
expect(hash1).toBe(hash2)
})
it("mixes line number for non-significant lines", () => {
//#given
const punctuationOnly = "{}"
//#when
const hash1 = computeLineHash(1, punctuationOnly)
const hash2 = computeLineHash(2, punctuationOnly)
//#then
expect(hash1).not.toBe(hash2)
})

8
src/tools/hashline-edit/hash-computation.ts
View File

@ -1,10 +1,12 @@
import { HASHLINE_DICT } from "./constants"
import { createHashlineChunkFormatter } from "./hashline-chunk-formatter"
const RE_SIGNIFICANT = /[\p{L}\p{N}]/u
export function computeLineHash(lineNumber: number, content: string): string {
const stripped = content.replace(/\s+/g, "")
const hashInput = `${lineNumber}:${stripped}`
const hash = Bun.hash.xxHash32(hashInput)
const stripped = content.endsWith("\r") ? content.slice(0, -1).replace(/\s+/g, "") : content.replace(/\s+/g, "")
const seed = RE_SIGNIFICANT.test(stripped) ? 0 : lineNumber
const hash = Bun.hash.xxHash32(stripped, seed)
const index = hash % 256
return HASHLINE_DICT[index]
}