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(resources): prune empty view-port rows [Q1,Q3]
Corey Olson056e9570b971
diff --git a/src/resources.js b/src/resources.jsindex 75f54ac2..c02aa827 100644--- a/src/resources.js+++ b/src/resources.js@@ -230,6 +230,22 @@ function update(db, action) {}}+/** Remove a view-port definition only after its last lease has left the resource queue. */+function removeEmptyViewPortResource(db, name) {+ if (!name.startsWith('view-port-')) return;+ db.prepare(`DELETE FROM resource WHERE name = ?+ AND NOT EXISTS (SELECT 1 FROM holder WHERE name = ?)+ AND NOT EXISTS (SELECT 1 FROM waiter WHERE name = ?)`)+ .run(name, name, name);+}++/** Sweep only empty view-port definitions after callers have pruned dead lease rows. */+function removeEmptyViewPortResources(db) {+ db.exec(`DELETE FROM resource WHERE name GLOB 'view-port-*'+ AND NOT EXISTS (SELECT 1 FROM holder WHERE holder.name = resource.name)+ AND NOT EXISTS (SELECT 1 FROM waiter WHERE waiter.name = resource.name)`);+}+/*** The admission order a pool uses now. Only the machine pool follows the machine settings* (gate.queue.reviewsFirst, currentReleaseFirst and agingMinutes); it is read on every poll so each process@@ -773,7 +789,10 @@ export async function takeResource(options) {/** Commit this holder's deletion before closing; a failed update remains live and retryable. */const release = () => {if (released || transferred) return;- update(db, () => db.prepare('DELETE FROM holder WHERE token = ?').run(token));+ update(db, () => {+ db.prepare('DELETE FROM holder WHERE token = ?').run(token);+ removeEmptyViewPortResource(db, name);+ });released = true;clearInterval(heartbeat);db.close();@@ -912,6 +931,9 @@ export function listResources({ scope = 'machine', root = process.cwd() } = {})const order = queueOrder(scope);const db = open(databaseFile(scope, root), scope === 'machine');try {- return update(db, () => db.prepare('SELECT name, capacity FROM resource ORDER BY name').all().map(({ name, capacity }) => ({ name, capacity, ...snapshot(db, name, order) })));+ return update(db, () => {+ removeEmptyViewPortResources(db);+ return db.prepare('SELECT name, capacity FROM resource ORDER BY name').all().map(({ name, capacity }) => ({ name, capacity, ...snapshot(db, name, order) }));+ });} finally { db.close(); }}diff --git a/test/resources-lease-fixture.js b/test/resources-lease-fixture.jsindex 43a5fb6d..d9e3d98b 100644--- a/test/resources-lease-fixture.js+++ b/test/resources-lease-fixture.js@@ -6,8 +6,99 @@ import { pathToFileURL } from 'node:url';import { createInterface } from 'node:readline';import { DatabaseSync } from 'node:sqlite';import * as store from '../src/board.js';+import { registerProject } from '../src/projects.js';+import { serveView } from '../src/serve.js';import { runFixtureChild } from './fixture-child.js';+/** Build the resource test's child programs with the importing test's absolute module URLs. */+export function resourceWorkerSources({ resourcesModule: MODULE, gateModule: GATE_MODULE, settingsModule: SETTINGS_MODULE }) {+ const POOL_MODULE_WORKER = `+import { takeResource } from ${JSON.stringify(MODULE)};+import { loadMachineSettings } from ${JSON.stringify(SETTINGS_MODULE)};+let announced = false;+const [root, agent, browserText, item, kind, landingText] = process.argv.slice(1);+const lease = await takeResource({+ name: 'gate', capacity: 2, scope: 'machine', root, agent,+ browserCapacityProvider: () => loadMachineSettings().browserSlots,+ browser: browserText === 'true', item, kind, itemCheck: kind === 'review',+ diagnostic: kind === 'diagnostic', landing: landingText === 'true',+ onWait: (state) => {+ if (!announced) { announced = true; console.log(JSON.stringify({ queued: state })); }+ },+});+try {+ console.log(JSON.stringify({ acquired: agent }));+ for await (const line of process.stdin) {+ if (String(line).trim() === 'release') break;+ }+} finally { lease.release(); }+`;+ const SUBMIT_CHECK = `+import { runSubmitGate } from ${JSON.stringify(GATE_MODULE)};+const [root, base, check] = process.argv.slice(1);+const result = await runSubmitGate(root, { gate: 'true', affectedTests: 'node bin/run-tests.js test/cpu-check.test.js' }, {+ base, changed: ['test/cpu-check.test.js'], check, agent: 'submit-check', item: '636',+});+process.stdout.write(JSON.stringify({ green: result.isGreen, full: result.full, reason: result.reason, files: result.files, checkGreen: result.check.green }) + '\\n');+`;+ const WORKER = `+import { takeResource } from ${JSON.stringify(MODULE)};+const [name, capacity, scope, root, agent, stallMs, landingText] = process.argv.slice(1);+let lastWait = '';+const lease = await takeResource({ name, capacity: Number(capacity), scope, root, agent, landing: landingText === 'true', onWait: ({position, holders, line, rejoined}) => {+ const state = JSON.stringify({waiting:position, holders, line, rejoined:rejoined ?? false});+ if (!lastWait || rejoined) { lastWait = state; console.log(state); }+} });+console.log(JSON.stringify({acquired:agent}));+let secondLease;+if (Number(stallMs) > 0) {+ Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Number(stallMs));+ console.log(JSON.stringify({resumed:true}));+}+process.stdin.setEncoding('utf8');+for await (const line of process.stdin) {+ if (line.trim() === 'second') {+ takeResource({ name, capacity: Number(capacity), scope, root, agent, landing: true }).then((nextLease) => {+ secondLease = nextLease;+ console.log(JSON.stringify({secondAcquired: agent}));+ });+ }+ if (line.trim() === 'renew') {+ try { lease.renew(); console.log(JSON.stringify({renewed:true})); }+ catch (error) { console.log(JSON.stringify({renewError:error.code})); }+ }+ if (line.trim() === 'release') { lease.release(); secondLease?.release(); break; }+}+`;+ return { POOL_MODULE_WORKER, SUBMIT_CHECK, WORKER };+}++/** Read private resource names without changing the database used by the caller. */+export function resourceNames(home) {+ const db = new DatabaseSync(join(home, 'resources.sqlite'));+ try { return db.prepare('SELECT name FROM resource ORDER BY name').all().map(({ name }) => name); }+ finally { db.close(); }+}++/** Run a scoped view against a private registry and machine home, restoring both on close. */+export async function openPrivateScopedView(box) {+ const previousHome = process.env.PULLBOARD_HOME;+ const previousMachineHome = process.env.PULLBOARD_MACHINE_HOME;+ const restore = () => {+ if (previousHome === undefined) delete process.env.PULLBOARD_HOME;+ else process.env.PULLBOARD_HOME = previousHome;+ if (previousMachineHome === undefined) delete process.env.PULLBOARD_MACHINE_HOME;+ else process.env.PULLBOARD_MACHINE_HOME = previousMachineHome;+ };+ process.env.PULLBOARD_HOME = box.home;+ process.env.PULLBOARD_MACHINE_HOME = box.home;+ try {+ registerProject(box.first);+ const view = await serveView({ port: 0, projectRoot: box.first });+ return { ...view, close: async () => { try { await view.close(); } finally { restore(); } } };+ } catch (error) { restore(); throw error; }+}+const CLOCKED_CLI = `import { readFileSync } from 'node:fs';import { main } from ${JSON.stringify(pathToFileURL(resolve(import.meta.dirname, '../src/cli.js')).href)};diff --git a/test/resources.test.js b/test/resources.test.jsindex 744d6c08..b278464b 100644--- a/test/resources.test.js+++ b/test/resources.test.js@@ -17,7 +17,7 @@ import { createE2eHelpers } from './e2e-helpers.js';import { capacityChangeCases } from './resources-capacity-fixture.js';import { checkNeedsBrowser } from '../src/browser-admission.js';import { releaseQueueProof } from './resources-release-fixture.js';-import { queuedLeaseProof } from './resources-lease-fixture.js';+import { openPrivateScopedView, queuedLeaseProof, resourceNames, resourceWorkerSources } from './resources-lease-fixture.js';import { checkProject, verificationProject } from './resources-verify-fixture.js';const TEMP = [];@@ -29,67 +29,10 @@ const PRE_RUNNER_MODULE = pathToFileURL(resolve(import.meta.dirname, './fixturesconst SETTINGS_MODULE = pathToFileURL(resolve(import.meta.dirname, '../src/settings.js')).href;const BIN = resolve(import.meta.dirname, '../bin/pullboard.js');const TEST_RUNNER = resolve(import.meta.dirname, '../bin/run-tests.js');-const POOL_MODULE_WORKER = `-import { takeResource } from ${JSON.stringify(MODULE)};-import { loadMachineSettings } from ${JSON.stringify(SETTINGS_MODULE)};-let announced = false;-const [root, agent, browserText, item, kind, landingText] = process.argv.slice(1);-const lease = await takeResource({- name: 'gate', capacity: 2, scope: 'machine', root, agent,- browserCapacityProvider: () => loadMachineSettings().browserSlots,- browser: browserText === 'true', item, kind, itemCheck: kind === 'review',- diagnostic: kind === 'diagnostic', landing: landingText === 'true',- onWait: (state) => {- if (!announced) { announced = true; console.log(JSON.stringify({ queued: state })); }- },-});-try {- console.log(JSON.stringify({ acquired: agent }));- for await (const line of process.stdin) {- if (String(line).trim() === 'release') break;- }-} finally { lease.release(); }-`;-const SUBMIT_CHECK = `-import { runSubmitGate } from ${JSON.stringify(GATE_MODULE)};-const [root, base, check] = process.argv.slice(1);-const result = await runSubmitGate(root, { gate: 'true', affectedTests: 'node bin/run-tests.js test/cpu-check.test.js' }, {- base, changed: ['test/cpu-check.test.js'], check, agent: 'submit-check', item: '636',-});-process.stdout.write(JSON.stringify({ green: result.isGreen, full: result.full, reason: result.reason, files: result.files, checkGreen: result.check.green }) + '\\n');-`;const PROCESS_INFO_POLICY = '(version 1)(allow default)(deny process-info*)';const SANDBOX_EXEC = process.platform === 'darwin' && existsSync('/usr/bin/sandbox-exec');const PERL_FORK = process.platform === 'darwin' && existsSync('/usr/bin/perl');-const WORKER = `-import { takeResource } from ${JSON.stringify(MODULE)};-const [name, capacity, scope, root, agent, stallMs, landingText] = process.argv.slice(1);-let lastWait = '';-const lease = await takeResource({ name, capacity: Number(capacity), scope, root, agent, landing: landingText === 'true', onWait: ({position, holders, line, rejoined}) => {- const state = JSON.stringify({waiting:position, holders, line, rejoined:rejoined ?? false});- if (!lastWait || rejoined) { lastWait = state; console.log(state); }-} });-console.log(JSON.stringify({acquired:agent}));-let secondLease;-if (Number(stallMs) > 0) {- Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, Number(stallMs));- console.log(JSON.stringify({resumed:true}));-}-process.stdin.setEncoding('utf8');-for await (const line of process.stdin) {- if (line.trim() === 'second') {- takeResource({ name, capacity: Number(capacity), scope, root, agent, landing: true }).then((nextLease) => {- secondLease = nextLease;- console.log(JSON.stringify({secondAcquired: agent}));- });- }- if (line.trim() === 'renew') {- try { lease.renew(); console.log(JSON.stringify({renewed:true})); }- catch (error) { console.log(JSON.stringify({renewError:error.code})); }- }- if (line.trim() === 'release') { lease.release(); secondLease?.release(); break; }-}-`;+const { POOL_MODULE_WORKER, SUBMIT_CHECK, WORKER } = resourceWorkerSources({ resourcesModule: MODULE, gateModule: GATE_MODULE, settingsModule: SETTINGS_MODULE });/** Create isolated machine storage and a pair of real Git repositories. */function fixture() {@@ -1826,3 +1769,58 @@ test('a verification with a frozen check still waits for its slot [C7,V4]', asynassert.equal(JSON.parse(completed.stdout).check, 'green');assert.equal(readFileSync(marker, 'utf8'), 'check-ran', 'the unchanged frozen command ran after admission');});++test('a stopped view leaves no view-port row [C7]', async () => {+ const box = fixture();+ const name = (port) => `view-port-${port}`;+ const names = () => resourceNames(box.home);+ const leases = [];+ let dead, holder, waiter, view;+ try {+ privateList(box);+ const baseline = names().filter((entry) => entry.startsWith('view-port-')).length;+ view = await openPrivateScopedView(box);+ const stopped = await privateTake(box, { name: name(view.port), capacity: 1, agent: 'view-port-stopped' });+ leases.push(stopped);+ assert.ok(names().includes(stopped.name), 'the running view has a resource row for its bound port');+ await view.close(); view = null;+ stopped.release(); leases.pop();+ assert.equal(names().filter((entry) => entry.startsWith('view-port-')).length, baseline,+ 'stopping the view and releasing its final lease returns to the prior view-port count');++ dead = worker(box, { name: name(4892), agent: 'view-port-dead' });+ await acquired(dead);+ dead.kill('SIGKILL'); await dead.finished; dead.lines.close();+ assert.ok(!privateList(box).some(({ name: entry }) => entry === name(4892)), 'the next resource read sweeps a dead view and its empty port row');++ holder = worker(box, { name: name(4893), agent: 'view-port-holder' });+ await acquired(holder);+ waiter = worker(box, { name: name(4893), agent: 'view-port-waiter' });+ await waitUntil(() => privateList(box).find(({ name: entry }) => entry === name(4893))?.line.some(({ agent }) => agent === 'view-port-waiter'),+ 'a same-port view waits behind the live holder');+ assert.ok(names().includes(name(4893)), 'a live holder and queued view retain their port row');+ await release(holder); holder = null;+ await acquired(waiter);+ assert.ok(names().includes(name(4893)), 'the waiting view keeps the row when it acquires the released port');+ await release(waiter); waiter = null;+ assert.ok(!names().includes(name(4893)), 'releasing the final view removes its port row');++ for (const resource of ['gate', 'ordinary', 'View-Port-4894']) {+ const lease = await privateTake(box, { name: resource, capacity: 1, agent: `${resource}-fixture` });+ leases.push(lease); lease.release(); leases.pop();+ }+ const db = new DatabaseSync(join(box.home, 'resources.sqlite'));+ try { db.prepare('INSERT INTO resource(name, capacity) VALUES (?, ?)').run('runner:fixture-host', 2); }+ finally { db.close(); }+ privateList(box);+ const kept = names();+ assert.ok(kept.includes('gate') && kept.includes('ordinary') && kept.includes('View-Port-4894') && kept.includes('runner:fixture-host'),+ 'empty gate, ordinary, case-distinct view-like, and runner definitions are preserved');+ } finally {+ try {+ for (const lease of leases.reverse()) lease.release();+ if (dead && !dead.exitResult) { dead.kill('SIGKILL'); await dead.finished; dead.lines.close(); }+ for (const child of [holder, waiter]) if (child && !child.exitResult) await release(child);+ } finally { if (view) await view.close(); }+ }+});