Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
Describe the intent line proof in the 0.60.616.0 changelog entry
garrytan2f30940d917c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 0aa9aee84f..4e8b05d8ec 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -16,10 +16,10 @@ identifiers and attribution are available in the pre-removal Git revision### Itemized changes-- `src/core/persistence/local-edit-adoption.ts`, `file-repair.ts`: `landedAdoptionCommit` finds this adoption's commit at HEAD (subject, `gbrain-adopted:` trailer, commit-ledger line, the pre-adoption blob in its parent and the adopted blob at HEAD). Preparation and the publication's recheck run the caller check only until that commit lands, and `settleAdoption` leaves a requeued adoption whose commit landed to the consumer instead of cancelling it. Fixes #8824.+- `src/core/persistence/local-edit-adoption.ts`, `file-repair.ts`: `landedAdoptionCommit` finds this adoption's commit at HEAD (subject, `gbrain-adopted:` trailer, commit-ledger line, the pre-adoption blob in its parent and the adopted blob at HEAD). The ledger's commit line is written after `git commit` and can be missing (a busy ledger lock, or a crash in between), so the intent line written before the commit also proves it when its `head_before` is the commit's parent and its message digest is the commit's. Preparation and the publication's recheck run the caller check only until that commit lands, and `settleAdoption` leaves a requeued adoption whose commit landed to the consumer instead of cancelling it. Fixes #8824.- `src/core/persistence/coordinator.ts`: `recoverPublication` stamps a landed adoption commit as `outcome.persistence = {git_state: committed, git_commit, landed_before_row: true}` on the requeued or failed receipt, the shape a strict source's landed door commit already uses; `completeWrite` keeps it on any later end without committing. Fixes #8767.- `src/core/persistence/pending-import.ts`: `operationMarkerPaths` adds `BISECT_LOG` and `SQUASH_MSG`, reads `git rev-parse --absolute-git-dir` as bytes and answers null on invalid UTF-8, or unless the one line (only its trailing newline stripped) is an absolute path that exists as a directory. `GIT_OPERATION_MARKERS` and `assertNoOperationInProgress` (`src/core/git/commit-push.ts`) are unchanged. A `git cherry-pick -n` leaves no marker; the adoption and its caller commit only their own path (`git commit --only`), so the picked path stays staged. Fixes #8826.-- Tests: `test/adopt-local-edit.test.ts` on PGLite and Postgres (a replay after the caller was cancelled before recovery requeued it; a terminal failure right after the adoption commit; a real `cherry-pick -n` of another path; a real bisect and a squash merge stopped on a conflict in another path), and `test/operation-marker-paths.test.ts` (a non-UTF-8 git dir reached through a clean symlink mid-cherry-pick, real squash merge and bisect, and a shim git answering with CRLF, a trailing space, a relative path, a missing directory, a file or no newline).+- Tests: `test/adopt-local-edit.test.ts` on PGLite and Postgres (a replay after the caller was cancelled before recovery requeued it; a terminal failure right after the adoption commit; a replay whose commit line never reached the ledger, and intent lines that prove nothing without their commit, on another parent or with another message; a real `cherry-pick -n` of another path; a real bisect and a squash merge stopped on a conflict in another path), and `test/operation-marker-paths.test.ts` (a non-UTF-8 git dir reached through a clean symlink mid-cherry-pick, real squash merge and bisect, and a shim git answering with CRLF, a trailing space, a relative path, a missing directory, a file or no newline).## [0.60.615.0] - 2026-11-08