Commit Graph
19 Commits
Author SHA1 Message Date
can1357 91d15b2ec8 fix(hashline)!: removed single-number hunk header shorthand
- Rejected bare `A` anchors; single-line ranges must now be spelled `A A`.
- Added a descriptive error for single-number headers to guide model output.
- Updated grammar, tokenizer, prompt docs, and tests to reflect the change.
2026-05-28 10:36:49 +02:00
can1357 7dd00c015b feat: hashline improvements for spark
- Redesigned hashline patch syntax from anchor-based (`A-B:`) to hunk-header format (`@@ A..B @@`) with unified-diff compatibility.
- Removed `autoDropPureInsertDuplicates` option and simplified apply behavior to preserve duplicated boundary and context lines.
- Changed repeat operator from `^A-B` to `&A..B` and range separator from `-` to `..` for consistency with hunk-header syntax.
- Added image resizing and dimension notes to eval tool output; improved write tool hashline header sanitation for legacy formats.
- Removed 521 lines of boundary-duplicate absorption code and simplified parser to auto-convert bare body rows and unified-diff contamination.
2026-05-28 03:06:52 +02:00
can1357 7c64576524 feat(hashline): replaced file-hash anchors with opaque snapshot-store tags
- Replaced 4-hex content-derived file hashes with 3-hex opaque tags minted by InMemorySnapshotStore, making tags session-bound pointers rather than content fingerprints.
- Removed lru-cache dependency; replaced LRU-bounded per-path rings with a flat 4096-slot global ring using a scrambled permutation to prevent LLM tag extrapolation.
- Made SnapshotStore required in Patcher (was optional); tag resolution now drives stale-anchor detection instead of recomputing hashes at apply time.
- Changed literal payload sigil from `|` to `+` and accepted `^A` shorthand for `^A-A`; added lenient recovery for bare bodies, lone `-` rows, and overlapping bare/concrete block pairs.
2026-05-28 01:00:23 +02:00
can1357 7fa55750f9 feat(hashline): introduced explicit range syntax and repeat edit kind for hashline
- Replaced anchor shorthand syntax with explicit range format (1: -> 1-1:) and removed ^/v sigils in favor of ^A-B repeat and A-B:- delete operations.
- Added repeat edit kind to support ^A-B syntax for copying lines A through B, and inline delete syntax A-B:- for range deletions.
- Removed after_anchor cursor kind and standalone delete rows; empty anchor blocks now produce blank-line replacements instead of deletions.
- Updated parser, tokenizer, and type system to discriminate literal and repeat payloads, and refactored apply/recovery logic to expand repeat edits into individual inserts.
- Updated coding-agent test fixtures and settings documentation to reflect new hashline syntax and behavior.
2026-05-27 22:51:21 +02:00
oldschoolaandcan1357 638ad1947c fix(hashline): exhaustive getEditAnchors + sync class/call-site docs with replay gate
getEditAnchors was a 6-line copy in both apply.ts and recovery.ts, with an unguarded 'return []' fallthrough on the cursor union. Adding a new anchor-bearing Cursor or Edit kind would silently route through 'return []' in the recovery copy, skip verifyAnchorContent's check, and reopen the corruption window PR #1422 closed. Rewrite both copies as a switch with a 'never'-assertion default so a new kind fails the typecheck.

Also bring the Recovery class docstring and the tryRecover call-site comment in line with the new contract. Both previously described strategy 2 only in terms of line-count equality ('the edits' line numbers still resolve to the right rows'), which is the framing the replay gate now refuses; updated text mentions both guards and points at replaySessionChainOnCurrent for the full rationale.
2026-05-27 18:55:48 +02:00
oldschoolaandcan1357 621aff533a fix(hashline): keep replay warning for ambiguous session-chain recovery
Codex review (P2) on PR #1422: the anchor-content guard significantly narrows the corruption window for session-chain replay, but doesn't eliminate it. A coincidental insert+delete pair earlier in the chain can leave a stale-anchored edit landing on a duplicated row even with both line-count and anchor-content guards satisfied — line counts still match, the line at the shifted index happens to carry identical text, but the logical row the model anchored against is gone.

Reinstate RECOVERY_SESSION_REPLAY_WARNING and emit it from the replay success path. The dedicated warning is the only cue that replay is the less-certain recovery mode and the diff warrants verification. The chain warning stays for the snapshot 3-way merge path where context lines provide stronger evidence. Comment near replaySessionChainOnCurrent updated to spell out the residual uncertainty.

Test in packages/hashline/test/recovery-session-chain.test.ts now asserts the replay warning on the safe-replay positive case (was asserting RECOVERY_SESSION_CHAIN_WARNING).

Also: cargo fmt on crates/pi-ast/src/summary.rs and crates/pi-natives/src/summary.rs — pre-existing rustfmt drift on upstream/main was breaking 'check:rs' on Linux CI for every PR (commit 3b37ffe22 'chore: reformat' was incomplete). Local rustfmt 1.9.0-nightly produces the exact diff CI demanded; running it across the workspace closes the gap. No behavior change in those crates.
2026-05-27 18:55:48 +02:00
oldschoolaandcan1357 56a7212035 fix(hashline): require anchor-content alignment in session-chain replay recovery
The recovery fallback that replays edits onto current text when the structured-patch 3-way merge refuses guarded only on line-count equality. If a prior in-session edit rewrote the very line a later stale-hash edit re-targets, replay overwrote the new content with the stale-anchored payload and emitted a 'Verify the diff matches your intent' warning that does not block the write.

Concrete window: v0 line 5 = 'L5', v1 = 'L5-CHANGED' (same line count). Edit E2 authored against H0 anchored at line 5 lands on v1 because the line-count gate passes, silently replacing L5-CHANGED with the model's L5-MODEL.

Add a verifyAnchorContent gate: walk every edit's anchors and require previousText[line] === currentText[line]. Any mismatch returns null so the caller raises MismatchError and the model re-reads. The success path now emits the standard RECOVERY_SESSION_CHAIN_WARNING (the hedged REPLAY_WARNING text was only sensible when content was partially aligned; that case is now unreachable, and the constant is removed).

Tests: packages/hashline/test/recovery-session-chain.test.ts pins both the corruption refusal and the safe-replay positive case (anchor on an unchanged line, 3-way merge fails on neighbouring rewritten context, replay succeeds with the standard chain warning). packages/coding-agent/test/core/hashline.test.ts adds an end-to-end through executeHashlineSingle so the production patcher path is covered too.
2026-05-27 18:55:29 +02:00
can1357 743dea964f docs(hashline): clarified sigil semantics and anchor-echo failure mode
- Renamed `payload-sigils` tag to `sigils` and tightened semantic bullet wording.
- Removed redundant rules subsumed by existing semantics.
- Added explicit common-failure entry warning against echoing anchor lines into `↑`/`↓` payloads.
- Added paired WRONG/RIGHT example demonstrating the duplicate-line bug.
2026-05-27 18:41:46 +02:00
can1357 8a0329026c refactor(hashline): redesigned patch syntax from sigil-ops to anchor+payload model
- Replaced `LINE↑`/`LINE↓`/`A-B:` op sigils with unified `A-B:` anchor + `|`/`↑`/`↓` payload sigils.
- Added `mode: "replacement"` tag to insert edits so the applier distinguishes replace-bucket from insert-bucket lines.
- Removed lenient fallbacks (implicit continuation, inline payload acceptance, escaped delimiter stripping).
- Updated grammar, prompt, tokenizer, parser, applier, and messages to match the new format.
2026-05-27 14:45:01 +02:00
can1357 024690419d feat(hashline): added detection and stripping of extra backslashes
- Added detection and stripping of extra backslashes before indented payload rows, which models often emit when JSON-escaping the delimiter.
- Added `_input` field alias support in hashlineEditParamsSchema to accept provider-emitted variants.
- Added warning message for escaped payload delimiter acceptance to guide users toward canonical syntax.
2026-05-27 13:28:08 +02:00
can1357 b0cedda9ae fix(hashline): modified scanInlineBody to strip the payload
- Modified scanInlineBody to strip the payload prefix when present at the start of inline content.
- Added test cases covering backslash-delimited payloads in insert, delete, and replace operations.
2026-05-27 13:21:42 +02:00
can1357 ed5615a6ca refactor(hashline): extracted streaming-tolerant patch parsing into dedicated functions
- Added `parsePatchStreaming` and `Executor.endStreaming` to handle in-flight ops gracefully during incremental parsing, dropping pending ops with no payload to avoid phantom edits.
- Introduced `PatchSection.applyPartialTo` as a streaming-aware counterpart to `applyTo`, using the new streaming parser for diff preview generation.
- Removed the custom `buildHashlineNaturalOrderPreviews` function and replaced it with calls to `applyPartialTo`, centralizing streaming logic in the parser layer.
2026-05-27 13:20:49 +02:00
can1357 4acfc50220 refactor(hashline): removed blank-target replace validation check
- Deleted the detectReplaceOnBlankTarget function and its invocation in applyEdits. Updated documentation to reflect that the applier now normalizes common model boundary mistakes rather than rejecting blank-line replacements.
2026-05-27 13:12:05 +02:00
can1357 558ef2ba33 feat(hashline): changed payload continuation prefix from + to \
- Updated the payload continuation syntax to use backslash (`\`) instead of plus (`+`) as the explicit prefix for multi-line payloads and blank lines.
- Modified grammar, format constants, parser comments, and all documentation and test cases to reflect the new syntax.
- This is a breaking change for existing hashline patches using the `+` prefix.
2026-05-27 13:06:59 +02:00
can1357 fe3b982976 refactor(hashline): removed delete operation support from hashline format
- Removed the `!` delete sigil and all associated parsing, validation, and tokenization logic. The delete operation is no longer a supported edit kind.
- Updated grammar, format constants, and error messages to reference only insert and replace operations.
- Simplified the executor's overlap validation to handle only replace operations.
2026-05-27 13:01:50 +02:00
can1357 e3ff9826d1 fix(hashline): skipped markdown comments before hashline operations in parser
- Parser now buffers markdown-style `#` lines and skips them when they directly precede a hashline operation.
- It now preserves comment lines that are not immediately before an operation while still handling blank separators as regular raw input.
- Added focused parser tests plus prompt and changelog updates describing the new comment-skipping behavior.
2026-05-27 13:01:49 +02:00
can1357 7a44d802de refactor: streamlined diff generation output and clarified hashline prompt rules
- Reduced default context lines from 4 to 2 in diff generation.
- Removed leading and trailing ellipsis placeholders from generated diff strings.
- Clarified the destructive nature of the replace operator and added examples in the prompt.
2026-05-27 13:01:49 +02:00
can1357 c0faf597c2 fix(hashline): added preflight write guards and duplicate target rejection
- Preflighted write policies for all sections before any commit in multi-section batches.
- Rejected duplicate canonical targets (e.g., `a.ts` and `./a.ts`) before writes begin.
- Fixed `after_anchor` normalization mutating cached edits across repeated patch applications.
- Fixed `detectLineEnding` to use first-occurrence style instead of majority vote.
2026-05-27 10:25:19 +02:00
can1357 b12e4698a6 feat: added @oh-my-pi/hashline package and migrated hashline tooling
- Added a dedicated @oh-my-pi/hashline package with parser, patcher, filesystem, snapshots, and release metadata.
- Migrated coding-agent hashline and stream entrypoints to @oh-my-pi/hashline and removed old hashline module exports.
- Changed multi-section hashline execution to validate section hashes and flush diagnostics only at the final commit.
- Added session fileSnapshotStore support and rewired edit/read/search/write tools to use it instead of fileReadCache.
2026-05-27 04:03:49 +02:00