fix: stop tracking the runtime control channel, and keep it that way - #1337
Merged
Conversation
#1311 untracked `.the-framework/control.jsonl` and added nothing to hold the line, so eighteen hours later a run's own branch committed an empty one straight back onto main (#1309). Tracking it is what #1298 is about: the daemon rewrites the control channel on every steer, so a tracked copy dirties every checkout and turns into delete-vs-modify conflicts between machines. Untracks it again, plus the copy under `packages/the-framework/` that a run executing inside the package directory left behind at the #1092 rename and that nothing has touched since. The guard is the point. The invariant is wider than one filename: `.the-framework/` is transient except the committed DB (#313/#857), so a tracked `run.json` or `events.jsonl` would churn a checkout exactly the same way. The new test asserts that every tracked path under a `.the-framework/` directory is one of the four committed kinds: the ignore file, LOGS.md, a conversation, or a user's session history. It skips itself outside a git checkout, so an installed package still tests. No changeset: nothing here ships in `dist`, so the published package is byte-identical.
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
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.
The regression
#1311 untracked
.the-framework/control.jsonland added nothing to hold the line. Eighteen hours later a run's own branch committed an empty one straight back ontomain, riding in with #1309.Tracking it is what #1298 is about: the daemon rewrites the control channel on every steer, so a tracked copy dirties every checkout it exists in and becomes a delete-vs-modify conflict between two machines.
This untracks it again, plus the copy under
packages/the-framework/.the-framework/that a run executing inside the package directory left behind at the #1092 rename. Both files are zero bytes.The guard is the actual fix
A second untracking with no guard would just be waiting for the third one. The invariant is wider than one filename:
.the-framework/is transient except the committed DB (#313/#857), so a trackedrun.jsonorevents.jsonlwould churn a checkout the same way.The new test in
control.test.tsasserts that every tracked path under a.the-framework/directory is one of the four committed kinds:.gitignoreLOGS.mdconversations/**<user>/sessions/**Anything else fails the test and names the offending paths. It skips itself when
git rev-parsefails, so an installed package outside a git checkout still tests clean.Verification
Proof-by-revert is built in: on
mainas it stands the test fails, naming both files.With the two removals, the framework suite is 1551 pass / 0 fail (1 skipped).
No changeset
Nothing here ships in
dist, so the published package is byte-identical. This is checkout hygiene, not a release.