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): keep identical reserved draft writes idempotent [D1]
Corey Olson66d4d995d813
diff --git a/src/doctrine-rulings.js b/src/doctrine-rulings.jsindex f90a2c1a..d599ff59 100644--- a/src/doctrine-rulings.js+++ b/src/doctrine-rulings.js@@ -36,7 +36,10 @@ import {} from './git.js';import { Refused } from './refused.js';import { writeRowApply } from './row-decisions.js';-import { loadSpec } from './spec.js';+import {+ loadSpec,+ parseSpec,+} from './spec.js';import {policyAt,trunkRef,@@ -167,6 +170,13 @@ export function proposeDoctrine(ctx, values, text, { id: fixed, reserved = [], wconst planned = { id: 'doctrine:' + id, row: { id, status: 'draft', tier, text: ruling, gate, section: section?.name ?? 'DR · Rulings' } };if (!write) return planned;const source = readFileSync(doctrine.repo.file, 'utf8');+ // Two identical callers may share the reservation. Check the bytes actually read, not a stale planning context.+ const existing = fixed ? parseSpec(source).rows.filter(row => row.id === fixed) : [];+ if (existing.length) {+ if (existing.length === 1 && existing[0].status === 'draft' && existing[0].text === ruling+ && existing[0].gate === gate && existing[0].tier === tier) return planned;+ throw new Refused('ROW_DRAFT', `${fixed} already names different or decided doctrine; reload its current row before proposing a new ruling`);+ }const newline = source.includes('\r\n') ? '\r\n' : '\n';const lines = source.split(/\r?\n/u);if (section) {diff --git a/test/rigor-checks.test.js b/test/rigor-checks.test.jsindex 2b90a338..e91cf67e 100644--- a/test/rigor-checks.test.js+++ b/test/rigor-checks.test.js@@ -24,6 +24,7 @@ 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 { proposeDoctrine } from '../src/doctrine-rulings.js';import { conflictNote } from '../src/trunk-conflict.js';import { conflictNoteFiles, conflictReport } from '../src/rigor-conflicts.js';@@ -456,3 +457,28 @@ test('a split draft resumes after its row is reserved [D1]', async () => {assert.equal(readFileSync(loadDoctrine(box.repo).repo.file, 'utf8'), before);} finally { store.closeBoard(board); }});+++test('concurrent split proposals keep one reserved row [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 dependencies = {+ read: () => ({ coordinator: true, rows: store.rowDrafts(board), decisions: store.rowDecisions(board) }),+ reserve: row => store.draftSpecRow(board, { agentId: 'coordinator', row, written: true }),+ };+ // The first await leaves an actual reservation; the second call recovers it before the first writes.+ await Promise.all([draftConflictSplits(ctx, report, dependencies), draftConflictSplits(ctx, report, dependencies)]);+ const doctrine = loadDoctrine(box.repo);+ assert.deepEqual(doctrine.repo.problems, [], 'concurrent identical writes never duplicate a row id');+ const proposed = doctrine.repo.rows.filter(row => row.text.includes('Source: conflict-split:'));+ assert.equal(proposed.length, 1);+ assert.equal(proposed[0].status, 'draft');+ assert.equal(store.rowDrafts(board).length, 1);+ const before = readFileSync(doctrine.repo.file, 'utf8');+ assert.throws(() => proposeDoctrine({ ...ctx, doctrine }, { source: 'fixture', gate: 'review' }, 'Different judgment', { id: proposed[0].id }), error => error.code === 'ROW_DRAFT');+ assert.equal(readFileSync(doctrine.repo.file, 'utf8'), before, 'a fixed-id retry cannot overwrite a different judgment');+ } finally { store.closeBoard(board); }+});