rescue: land the shared checkout's uncommitted work - #69
Merged
Merged
Conversation
The shared checkout's dirty tree (198 files, incl. untracked) is preserved as backup/uncommitted-2026-09-19 and replayed onto origin/main. The 53 entries that applied cleanly land here; the conflicts were resolved against current main, keeping the exclusive additions: - AGENTS.md: the code-hygiene and Git-practice rules are new content, so they are added under "Maintain shared knowledge" (main's rewrite left no anchor). - docs/AGENTS.md: the post-mortem triage rule is the same sentence main added, so main's placement is kept, and the reworded paragraph is preserved. The remaining conflicts were the older generation of files that main has since superseded (protocol/service parsing, the store base, retrieval ordering, the complexity gate, package.json), so main's version stands. The local variant of tools/relevance-model-train.ts (1677 lines) stays only on the backup branch: the current design owns that file as prepare/fitting/reporting on top of tools/relevance-training-data.ts.
Goal ledgers, goal events and the goal-pool snapshot are local planning state. A scratch plan is not repository content, so the directory and the snapshot are ignored, and the copies an earlier commit picked up are removed from the index.
…tem records tests/lab/relevance-model.test.ts passed but no CI job reached it, so tests/lab/**/*.test.ts joins test:coverage and test:product. The two postmortem records the dirty tree carried are byte-identical to the copies on feat/ooo-run-namespace, which also has the index rows, so they are dropped here instead of duplicated.
35 design documents differed from main only by re-wrapped paragraphs, and package-lock.json by three lines of an older resolution; both are restored to main. The remaining design differences are real additions and stay for review. src/core/qpp.ts and src/core/store/schema.ts are back to main as well: reverting them did not change the one product test that fails here, which points at this worktree's install rather than at the branch.
src/lab/service.ts imports ./protocol.ts and ./data-path.ts, which exist nowhere in the tree, and it does not type-check: it is work in progress that was interrupted in the shared checkout. Nothing references it, so it stays on backup/uncommitted-2026-09-19 instead of making this branch red. With it out, tsc --noEmit reports no errors.
…s cause Re-throwing the artifact diagnostic inside the catch dropped the error it came from, which the preserve-caught-error rule refuses: the kept artifact is the evidence for the claim, and the original failure is the cause of the rethrow.
Every one of the ten remaining design differences was markdown formatting: table separator rows padded out, emphasis markers changed to underscores, code blocks re-indented, a trailing comma added. design.md additionally carried an older paragraph that main has since replaced, so restoring main's blobs removes a silent revert. The branch's real content is its source, tests, tools and run archive.
wefio
added a commit
that referenced
this pull request
Sep 19, 2026
Both sides added the same two paths, and both sides are the same work, so the merge keeps this branch's version of each, which is the newer of the two: - the archived continuation README points at design/task-unit-semantics-obligations.md, the ledger's home after 0d3dc09 moved it (#65); the incoming side still named the old path - evals/ooo-execution/live-continuation.ts keeps the declared throws helper from 7d39f6f; the incoming side inlined the same cases Nothing else conflicted: the rest of #69 was already present on this branch.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
rescue: land the shared checkout's uncommitted work
The shared checkout's dirty tree (198 files, incl. untracked) is preserved
as backup/uncommitted-2026-09-19 and replayed onto origin/main. The 53
entries that applied cleanly land here; the conflicts were resolved against
current main, keeping the exclusive additions:
are added under "Maintain shared knowledge" (main's rewrite left no anchor).
so main's placement is kept, and the reworded paragraph is preserved.
The remaining conflicts were the older generation of files that main has since
superseded (protocol/service parsing, the store base, retrieval ordering, the
complexity gate, package.json), so main's version stands. The local variant of
tools/relevance-model-train.ts (1677 lines) stays only on the backup branch:
the current design owns that file as prepare/fitting/reporting on top of
tools/relevance-training-data.ts.