Autonomous development for real products. Governed agents build from specs you approve, follow the rules you set, and nothing merges until another agent proves it. Your decisions, judgement and taste are the bar that work must clear. Declare your vision and let agents build it.
JavaScript agentic-codingai-agentsai-governanceautonomous-agentsclaude-codeclicode-reviewcodexcoding-agentsdeveloper-toolsgit-hooksllmlocal-firstmulti-agentsoftware-factoryspec-driven-developmentverificationvibe-coding
fix(rigor): resume reserved split drafts without reviving decisions [D1]
Corey Olson68fc551ee60d
diff --git a/src/cli.js b/src/cli.jsindex 00bb13c9..b125ce99 100644--- a/src/cli.js+++ b/src/cli.js@@ -352,7 +352,10 @@ import {reportView,} from './background-view.js';import { rigorDraftCommand } from './rigor-draft.js';-import { conflictLines, conflictReport } from './rigor-conflicts.js';+import {+ conflictLines,+ conflictReport,+} from './rigor-conflicts.js';import { draftConflictSplits } from './rigor-splits.js';import { nextReview } from './next-review.js';import { serveApi } from './api.js';@@ -2662,7 +2665,7 @@ function readCommands(io, { first, second, rest, values }) {if (first || second || rest.length) throw new Refused('USAGE', 'pullboard rigor takes no arguments; to draft a rule: pullboard rigor draft <key> "<rule>" --check "<command>" --red <commit> --green <commit>');const ctx = context(io);const report = withBoard(ctx, (board) => { const history = store.events(board); return { ...rigorReport(history, { person: store.PERSON }), ...conflictReport(history) }; });- if (values['draft-splits']) report.splitDrafts = await draftConflictSplits(ctx, report, { read: () => withBoard(ctx, (board) => ({ coordinator: whoAmI(ctx, board).id === COORDINATOR, rows: store.rowDrafts(board) })), reserve: row => reserveRow(ctx, row, true) });+ if (values['draft-splits']) report.splitDrafts = await draftConflictSplits(ctx, report, { read: () => withBoard(ctx, (board) => ({ coordinator: whoAmI(ctx, board).id === COORDINATOR, rows: store.rowDrafts(board), decisions: store.rowDecisions(board) })), reserve: row => reserveRow(ctx, row, true) });io.result?.(report);for (const line of [...rigorLines(report), ...conflictLines(report)]) io.say(line);for (const draft of report.splitDrafts ?? []) io.say(`${draft.id}: draft split proposal; person approval required`);diff --git a/src/rigor-conflicts.js b/src/rigor-conflicts.jsindex e5c96d05..465a7e87 100644--- a/src/rigor-conflicts.js+++ b/src/rigor-conflicts.js@@ -1,5 +1,8 @@/** Recent merge collisions are architectural advice, separate from proof-bound Rigor causes [D1]. */-import { conflictNote, shownPath } from './trunk-conflict.js';+import {+ conflictNote,+ shownPath,+} from './trunk-conflict.js';const WINDOW_DAYS = 14;const HOT_ITEMS = 2;diff --git a/src/rigor-splits.js b/src/rigor-splits.jsindex 8c4087ca..eb2a7000 100644--- a/src/rigor-splits.js+++ b/src/rigor-splits.js@@ -2,7 +2,20 @@import { loadDoctrine } from './doctrine.js';import { proposeDoctrine } from './doctrine-rulings.js';import { Refused } from './refused.js';-import { splitAlreadyProposed, splitProposal } from './rigor-conflicts.js';+import {+ splitAlreadyProposed,+ splitProposal,+} from './rigor-conflicts.js';++/** Finish the exact original pending file write after its durable reservation, never reviving a decided row. */+function resumeSplit(ctx, doctrine, entry, decisions) {+ if (decisions.some(decision => decision.kind === 'doctrine' && decision.id === entry.id)) {+ throw new Refused('STALE_ROW_DECISION', `${entry.id} has a person decision but its doctrine row is missing; a split retry cannot recreate it`, 'ask the coordinator to restore the decided doctrine row and run pullboard spec apply before retrying');+ }+ const suffix = / Source: (conflict-split:[A-Za-z0-9_-]+)$/u.exec(entry.text);+ if (!suffix) throw new Refused('ROW_DRAFT', `${entry.id} has an incomplete split source; ask the coordinator to inspect its row reservation before retrying`);+ return proposeDoctrine({ ...ctx, doctrine }, { source: suffix[1], gate: entry.gate }, entry.text.slice(0, suffix.index), { id: entry.id });+}/** Reserve and write pending review-gated rulings through the existing ordinary doctrine path. */export async function draftConflictSplits(ctx, report, { read, reserve }) {@@ -11,7 +24,16 @@ export async function draftConflictSplits(ctx, report, { read, reserve }) {const splitDrafts = [];for (const file of report.hotFiles) {const doctrine = loadDoctrine(ctx.info.root, ctx.config);- if (splitAlreadyProposed([...doctrine.repo.rows, ...state.rows], file)) continue;+ if (splitAlreadyProposed(doctrine.repo.rows, file)) continue;+ // A reservation is not a materialized draft: a crash between these two writes must be recoverable.+ const interrupted = state.rows.find(row => row.written && row.target === 'doctrine'+ && !doctrine.repo.rows.some(existing => existing.id === row.id)+ && splitAlreadyProposed([{ ...row, status: 'draft' }], file));+ if (interrupted) {+ splitDrafts.push(resumeSplit(ctx, doctrine, interrupted, state.decisions ?? []));+ continue;+ }+ if (splitAlreadyProposed(state.rows, file)) continue;const suggestion = splitProposal(file);const values = { source: suggestion.source, gate: 'review' };const planned = proposeDoctrine({ ...ctx, doctrine }, values, suggestion.text, { reserved: state.rows.map(row => row.id), write: false });diff --git a/test/rigor-checks.test.js b/test/rigor-checks.test.jsindex 0ed5386b..2b90a338 100644--- a/test/rigor-checks.test.js+++ b/test/rigor-checks.test.js@@ -22,6 +22,8 @@ import * as store from '../src/board.js';import { submitFixture } from './board-submit-fixture.js';import { createE2eHelpers } from './e2e-helpers.js';import { loadDoctrine } from '../src/doctrine.js';+import { loadConfig } from '../src/config.js';+import { draftConflictSplits } from '../src/rigor-splits.js';import { conflictNote } from '../src/trunk-conflict.js';import { conflictNoteFiles, conflictReport } from '../src/rigor-conflicts.js';@@ -413,3 +415,44 @@ test('Pullboard\'s four checks count what main has [D1, C7]', async (t) => {['test/late.test.js', 'test/queued-walk.test.js'], 'a declaration below the first code line is not read, as the selection reads it');});});++test('a split draft resumes after its row is reserved [D1]', async () => {+ const box = conflictHistory();+ const board = store.openBoard(join(box.repo, '.git/pullboard/board.sqlite'));+ try {+ const report = conflictReport(store.events(board));+ const ctx = { info: { root: box.repo, isMain: true }, config: loadConfig(box.repo) };+ const before = readFileSync(loadDoctrine(box.repo).repo.file, 'utf8');+ let interrupted = false;+ let calls = 0;+ const dependencies = {+ read: () => ({ coordinator: true, rows: store.rowDrafts(board), decisions: store.rowDecisions(board) }),+ /** Interrupt once after the real durable reservation, before the ordinary file write. */+ reserve: row => {+ calls += 1;+ const entry = store.draftSpecRow(board, { agentId: 'coordinator', row, written: true });+ if (!interrupted) { interrupted = true; throw new Error('fixture interruption after durable reservation'); }+ return entry;+ },+ };+ await assert.rejects(draftConflictSplits(ctx, report, dependencies), /fixture interruption after durable reservation/u);+ assert.equal(readFileSync(loadDoctrine(box.repo).repo.file, 'utf8'), before);+ const reserved = store.rowDrafts(board);+ assert.equal(reserved.length, 1, 'the reservation survived the interrupted file write');+ const recovered = await draftConflictSplits(ctx, report, dependencies);+ assert.equal(recovered.length, 1, 'a board reservation alone cannot pretend the file draft exists');+ assert.equal(recovered[0].row.id, reserved[0].id, 'recovery keeps the exact reserved identity');+ assert.equal(calls, 1, 'recovery does not reserve another identity');+ const row = loadDoctrine(box.repo).repo.rows.find(row => row.id === reserved[0].id);+ assert.equal(row.status, 'draft');+ assert.equal(row.text, reserved[0].text, 'recovery preserves the original pending judgment and source');+ assert.equal(row.gate, 'review');+ assert.equal(store.rowDrafts(board).length, 1);+ assert.deepEqual(await draftConflictSplits(ctx, report, dependencies), []);+ const declined = box.run(box.repo, 'spec', 'decline', 'doctrine:' + row.id, '--reason', 'choose another split');+ assert.equal(declined.code, 0, declined.out + declined.err);+ writeFileSync(loadDoctrine(box.repo).repo.file, before);+ await assert.rejects(draftConflictSplits(ctx, report, dependencies), error => error.code === 'STALE_ROW_DECISION', 'an interrupted retry never recreates a row with a person decision');+ assert.equal(readFileSync(loadDoctrine(box.repo).repo.file, 'utf8'), before);+ } finally { store.closeBoard(board); }+});