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(cos): resume a claim when its @login reviewer reviews after the agent stopped waiting (#12926)
Adam Eivy0032f0ab101b
diff --git a/server/services/cosMergeHandoff.completedOwner.test.js b/server/services/cosMergeHandoff.completedOwner.test.jsindex dccac9a385..9e3a9aa9ec 100644--- a/server/services/cosMergeHandoff.completedOwner.test.js+++ b/server/services/cosMergeHandoff.completedOwner.test.js@@ -55,6 +55,21 @@ describe('completed owner required review inspection', () => {f.tasks.task.metadata.prCompletion = 'merge-on-green'; f.hold = null;expect(await inspect()).toMatchObject({ disposition: 'held', reason: 'review-not-required', reviewTarget: { headSha: head } });});+ it('waits for a username-only reviewer and resumes only on a review of the bound head', async () => {+ f.roster = { reviewers: [], optionalReviewers: [], usernames: ['Alice'], reviewerMaxRounds: {} };+ const review = (over) => ({ author: { login: 'alice' }, state: 'COMMENTED', commit: { oid: head }, ...over });+ expect(await inspect()).toMatchObject({ disposition: 'held', reason: 'review-forge-unreadable' });+ for (const reviews of [[], [review({ commit: { oid: 'b'.repeat(40) } })], [review({ author: { login: 'mallory' } })],+ [review({ state: 'PENDING' })], [review({ state: 'DISMISSED' })]]) {+ f.pr = { ...f.pr, reviews };+ expect(await inspect()).toMatchObject({ disposition: 'held', reason: 'awaiting-forge-review' });+ }+ f.pr = { ...f.pr, reviews: [review()] };+ expect(await inspect()).toMatchObject({ disposition: 'review-required', reason: 'forge-review-submitted', agentId: 'owner',+ roster: { usernames: ['Alice'] }, reviewTarget: { headSha: head } });+ f.roster.optionalReviewers = ['@alice'];+ expect(await inspect()).toMatchObject({ disposition: 'held', reason: 'review-required-roster-unproven' });+ });it('preserves ambiguous owners, live holders, task holds and draft PRs', async () => {f.agents.push({ ...f.agents[0], id: 'second' });expect((await inspect()).reason).toBe('review-owner-ambiguous'); f.agents.pop();diff --git a/server/services/cosMergeHandoff.js b/server/services/cosMergeHandoff.jsindex 5c6d6ad613..418474d8fc 100644--- a/server/services/cosMergeHandoff.js+++ b/server/services/cosMergeHandoff.js@@ -161,6 +161,31 @@ export async function validateCleanupReviewTarget({ target, workspacePath, requireturn null;}+const lowerLogin = (value) => String(value ?? '').replace(/^@+/, '').toLowerCase();++/** Non-optional `@login` reviewers of a roster, lower-cased and `@`-free. */+function requiredForgeLogins(roster) {+ const optional = new Set((roster.optionalReviewers || []).map(lowerLogin));+ return (roster.usernames || []).map(lowerLogin).filter((login) => login && !optional.has(login));+}++// A review counts only when one of `logins` submitted it against exactly the+// bound head; drafts (PENDING) and withdrawn (DISMISSED) reviews never resume+// work. true/false is an answer, null means the forge could not be read.+async function forgeReviewSubmittedOnHead(target, logins, forgeAccount) {+ const pr = parsePullRequestUrl(target.prUrl);+ const repoSpec = pr && githubRepoSpec({ host: pr.host, fullName: `${pr.owner}/${pr.repo}` });+ if (!repoSpec) return null;+ const options = await resolveForgeExecOptions(target.repoPath, { forgeAccount });+ const raw = await execGh(['pr', 'view', String(pr.number), '--repo', repoSpec, '--json', 'reviews'], undefined,+ { cwd: options.cwd, env: options.env }).catch(() => null);+ const view = safeJSONParse(raw, null);+ if (!isPlainObject(view) || !Array.isArray(view.reviews)) return null;+ return view.reviews.some((review) => logins.includes(lowerLogin(review?.author?.login))+ && !['PENDING', 'DISMISSED'].includes(String(review?.state || '').toUpperCase())+ && String(review?.commit?.oid || '').toLowerCase() === target.headSha);+}+/** Resolve a genuinely missing required review without adopting a completed* owner into merge admission. Ambiguous history and optional/no-review policies* retain the branch; pending CI by itself never creates cognitive work.@@ -232,7 +257,16 @@ export async function inspectCompletedOwnerReview({ agentId = null, repoPath, brif (policy === PR_COMPLETIONS.MERGE_ON_GREEN) return { ...held('review-not-required'), agentId: agent.id, originalTask: task,roster: await followUpRoster(task, policy), reviewTarget: target };const roster = await followUpRoster(task, PR_COMPLETIONS.REVIEW_THEN_MERGE);- if (!roster.reviewers?.some(reviewer => !roster.optionalReviewers?.includes(reviewer))) return held('review-required-roster-unproven');+ if (!roster.reviewers?.some(reviewer => !roster.optionalReviewers?.includes(reviewer))) {+ // A username-only roster has no local verdict to prove: the review is a forge+ // event. Resume only when a required login has reviewed this exact head.+ const logins = requiredForgeLogins(roster);+ if (!logins.length) return held('review-required-roster-unproven');+ const reviewed = await forgeReviewSubmittedOnHead(target, logins, app.forgeAccount);+ if (reviewed === null) return held('review-forge-unreadable');+ if (!reviewed) return held('awaiting-forge-review');+ return { disposition: 'review-required', reason: 'forge-review-submitted', agentId: agent.id, originalTask: task, roster, reviewTarget: target };+ }const review = await readReviewEvidence(worktreePath);if (review.status === 'unreadable') return held('review-evidence-unreadable');if (reviewEvidenceAccepted(review, headSha, PR_COMPLETIONS.REVIEW_THEN_MERGE, roster)) return { ...held('review-recorded-handoff-missing'), agentId: agent.id, originalTask: task, roster, reviewTarget: target };