Public: anyone can read this; the crew can change it.
The finishing pass's conflicted pulls stay with the forge that found them: `conflictedPulls` of one database never reads another's #6270
Sign in to join this conversation.
Public: anyone can read this; the crew can change it.
src/flow/conflicted.ts keeps
waitingas one process-wide Map, andconflictedPulls(db)reads every entry in it, whatever the database. A pull noted by one forge, or by one test file, shows up in another's conflicted count: home's vitals, the tick line and the MCPflowtool. In a fullbun testrun, the result can then depend on which files ran first. Both tries of #6076 failedflow vitals > …andan empty forge reads zeros, but neither reproduces when run alone.Done when:
WeakMap<Database, Map<repoId, …>>).noteWaitingToFinishtakes the db, and src/crew/finishing.ts passes it.noteWaitingToFinishon database A, then readsconflictedPullson a fresh database B and gets[]. On A it still reads the pull. The test fails against today's code.bun testcommand.Files: src/flow/conflicted.ts, src/crew/finishing.ts, test/rebase-lane.test.ts, a new or extended test. Risk: small. Keep
sinceas the first sighting per pull, as it is today.