Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: accept a clean all-optional review roster in the pending-merge handoff without a REVIEW_HEAD (#12478)
[._.]/ Adam Eivy2c96c72b94c6
diff --git a/server/services/cosMergeHandoff.js b/server/services/cosMergeHandoff.jsindex 9189a353cc..30d8053611 100644--- a/server/services/cosMergeHandoff.js+++ b/server/services/cosMergeHandoff.js@@ -73,10 +73,15 @@ async function readReviewEvidence(workspace) {}// A clean verdict counts only for the head it reviewed; merge-on-green runs no-// reviewers, so there only a recorded block or unreadable status refuses.-function reviewEvidenceAccepted({ status, head: reviewedHead }, head, policy) {+// reviewers, so there only a recorded block or unreadable status refuses. When+// every local reviewer is optional the in-session merge treats them as+// non-blocking, so a clean status needs no head: capped rounds that all returned+// (fixed) findings never record one.+function reviewEvidenceAccepted({ status, head: reviewedHead }, head, policy, { reviewers = [], optionalReviewers = [] } = {}) {if (policy === PR_COMPLETIONS.MERGE_ON_GREEN) return status === null || status === 'clean';- return status === 'clean' && reviewedHead === head;+ if (status !== 'clean') return false;+ const allOptional = reviewers.length > 0 && reviewers.every((reviewer) => optionalReviewers.includes(reviewer));+ return allOptional || reviewedHead === head;}async function followUpRoster(task, policy) {@@ -138,7 +143,8 @@ export async function handoffPendingMerge({ agentId, prUrl, headSha, worktreePatreturn refuse('checkout-head-unverified');}const review = await readReviewEvidence(workspace);- if (!reviewEvidenceAccepted(review, head, policy)) return refuse('review-evidence-incomplete');+ const roster = await followUpRoster(task, policy);+ if (!reviewEvidenceAccepted(review, head, policy, roster)) return refuse('review-evidence-incomplete');const receipt = {id: randomUUID(), appId: app.id, prUrl, prNumber: pr.number, headSha: head, repository,@@ -161,7 +167,7 @@ export async function handoffPendingMerge({ agentId, prUrl, headSha, worktreePatreceiptId: receipt.id, agentId, startedAt: agent.startedAt, taskId: agent.taskId, repository,headSha: head, worktreePath: workspace, prCompletion: policy, reviewStatus: review.status ?? 'not-configured', acceptedAt: receipt.queuedAt,},- followUp: await followUpRoster(task, policy),+ followUp: roster,}).catch((err) => {console.error(`❌ Pending-merge handoff for PR #${pr.number} could not be persisted: ${err.message}`);return false;diff --git a/server/services/cosMergeHandoff.test.js b/server/services/cosMergeHandoff.test.jsindex 103a489baa..b81a110ef0 100644--- a/server/services/cosMergeHandoff.test.js+++ b/server/services/cosMergeHandoff.test.js@@ -6,7 +6,7 @@ import { join } from 'node:path';// Agent → server pending-merge handoff (#12247), end to end through the real// admission service and the real pr-watcher coordinator over synthetic stores.const f = vi.hoisted(() => ({- state: null, tasks: {}, apps: new Map(), checkouts: {}, pr: null, foreign: new Set(),+ state: null, tasks: {}, apps: new Map(), checkouts: {}, pr: null, foreign: new Set(), optionalReviewers: [],}));vi.mock('./cosState.js', async () => {const { createFileWriteQueue } = await import('../lib/fileWriteQueue.js');@@ -44,7 +44,7 @@ vi.mock('./apps.js', () => ({}));vi.mock('./untrustedContent.js', () => ({ screenUntrustedContent: async () => ({ ok: true, screening: { safe: true } }) }));vi.mock('./codeReview.js', () => ({- resolveReviewLoopOptions: async () => ({ reviewers: ['codex'], usernames: [], optionalReviewers: [], reviewerMaxRounds: {} }),+ resolveReviewLoopOptions: async () => ({ reviewers: ['codex'], usernames: [], optionalReviewers: f.optionalReviewers, reviewerMaxRounds: {} }),}));const mergePrMock = vi.fn();vi.mock('./git.js', () => ({ mergePR: (...args) => mergePrMock(...args) }));@@ -95,6 +95,7 @@ beforeEach(async () => {f.apps = new Map([['app1', { id: 'app1', repoPath: '/repos/source', forgeAccount: null }]]);f.checkouts = { [workspace]: { branch: 'claim/issue-1', head: HEAD } };f.foreign = new Set();+ f.optionalReviewers = [];f.pr = {number: 7, title: 'Example change', body: 'Closes #101', author: { login: 'example-user' },commits: [{ messageHeadline: 'fix: example', messageBody: '' }], state: 'OPEN', isDraft: false,@@ -161,6 +162,19 @@ describe('pending-merge handoff', () => {expect(pending()).toEqual([]);});+ it('queues an all-optional roster on a clean status without a REVIEW_HEAD, but not blocked or a required reviewer', async () => {+ f.optionalReviewers = ['codex'];+ await writeFile(join(workspace, 'portos-review-status'), 'REVIEW_STATUS=clean\n');+ expect(await handoff()).toMatchObject({ queued: true });++ await writeFile(join(workspace, 'portos-review-status'), 'REVIEW_STATUS=review-blocked\n');+ expect(await handoff()).toMatchObject({ queued: false, reason: 'review-evidence-incomplete' });++ f.optionalReviewers = [];+ await writeFile(join(workspace, 'portos-review-status'), 'REVIEW_STATUS=clean\n');+ expect(await handoff()).toMatchObject({ queued: false, reason: 'review-evidence-incomplete' });+ });+it('merges at once when CI already settled before the receipt, without waiting for the timer', async () => {greenChecks();expect(await handoff()).toMatchObject({ queued: true });