Skip to content

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.

fix(queue): show file holds consistently with next [N2,N20]

Corey Olsoneacdeb1c5809
diff --git a/src/board.js b/src/board.js
index ead0705f..6e3386d0 100644
--- a/src/board.js
+++ b/src/board.js
@@ -48,7 +48,10 @@ import {
briefFiles,
briefSections,
} from './brief.js';
-import { itemFiles, itemFileCollisions } from './item-files.js';
+import {
+ itemFiles,
+ itemFileCollisions,
+} from './item-files.js';
export { itemFiles };
import { COORDINATOR } from './config.js';
import {
diff --git a/src/commands/claim.js b/src/commands/claim.js
index 6992466e..1d313733 100644
--- a/src/commands/claim.js
+++ b/src/commands/claim.js
@@ -2,7 +2,10 @@
import {
headCommit,
} from '../git.js';
-import { getItem, listItems } from '../board.js';
+import {
+ getItem,
+ listItems,
+} from '../board.js';
import { itemFileCollisions } from '../item-files.js';
import {
MainSpecMerged,
diff --git a/src/queue.js b/src/queue.js
index b7a0c0cf..bd786fd1 100644
--- a/src/queue.js
+++ b/src/queue.js
@@ -6,6 +6,7 @@
* next cannot disagree. It is for agents and coordinators; the person reads the Roadmap instead.
*/
import { Refused } from './refused.js';
+import { itemFileCollisions } from './item-files.js';
import {
buildOrder,
canTake,
@@ -21,6 +22,7 @@ import {
* Who holds an item now: its builder while claimed, its reviewer while a submitted item is reserved.
*
* @param {any} item
+ * @param {any[]} inFlight
* @param {number} now
* @returns {string | null}
*/
@@ -37,13 +39,13 @@ function holderOf(item, now) {
* @param {any} item
* @returns {string[]}
*/
-function waitsOf(board, item) {
+function waitsOf(board, item, inFlight) {
const after = (item.item_after ? item.item_after.split(',').map(Number) : [])
.map((id) => itemById(board, id))
.filter((before) => before && before.item_status !== 'verified')
.map((before) => `#${before.item_id} (${before.item_status})`);
const lane = laneHold(board, item.item_lane);
- return [...after, ...(item.item_hold_reason ? [`held: ${item.item_hold_reason}`] : []), ...(lane ? [`${item.item_lane} lane held: ${lane.hold_reason}`] : [])];
+ return [...after, ...itemFileCollisions(item, inFlight), ...(item.item_hold_reason ? [`held: ${item.item_hold_reason}`] : []), ...(lane ? [`${item.item_lane} lane held: ${lane.hold_reason}`] : [])];
}
/**
@@ -58,12 +60,13 @@ export function workQueue(board) {
const release = milestonePriorities(board);
const planned = roadmap(board, (reference) => ({ id: reference, title: reference, status: 'unavailable' }));
const items = listItems(board).sort(buildOrder(board));
+ const inFlight = listItems(board, { all: true });
const entry = (item) => ({ id: item.item_id, title: item.item_title, route: item.item_route, lane: item.item_lane,
- status: item.item_status, holder: holderOf(item, now), waits: waitsOf(board, item) });
+ status: item.item_status, holder: holderOf(item, now), waits: waitsOf(board, item, inFlight) });
const releases = planned.map((milestone, index) => ({ name: milestone.name, landed: milestone.landed, total: milestone.total, shipped: Boolean(milestone.shipped),
items: items.filter((item) => release(item) === index).map(entry) })).filter((milestone) => !milestone.shipped || milestone.items.length);
const unreleased = items.filter((item) => release(item) >= planned.length).map(entry);
- const pullable = items.filter((item) => item.item_status === 'open' && !waitsOf(board, item).length);
+ const pullable = items.filter((item) => item.item_status === 'open' && !waitsOf(board, item, inFlight).length);
const first = Object.fromEntries([...ROUTES].reverse().map((route) => [route, pullable.find((item) => canTake(route, item.item_route))?.item_id ?? null]));
return { releases: releases.map(({ shipped, ...milestone }) => milestone), unreleased, first };
}