agents-relay 2.0.209 → 2.0.210

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/dist/cli-help.js +10 -4
  2. package/dist/cli-prompt.js +2 -1
  3. package/dist/cli-revision.js +49 -0
  4. package/dist/cli-worker-task.js +15 -0
  5. package/dist/cli.js +11 -2
  6. package/dist/dashboard-html.js +2 -2
  7. package/dist/dependency-revision-execution.js +152 -0
  8. package/dist/dependency-validity.js +17 -0
  9. package/dist/final-review-role.js +17 -0
  10. package/dist/force-restate-validation.js +3 -2
  11. package/dist/job-pr-number-migration.js +2 -1
  12. package/dist/managed-worker-input.js +2 -1
  13. package/dist/planner-agent-roles.js +18 -0
  14. package/dist/planner-runtime.js +7 -1
  15. package/dist/planner-task-ids.js +1 -0
  16. package/dist/planner.js +11 -6
  17. package/dist/reconciler-review.js +78 -96
  18. package/dist/reconciler-runtime.js +13 -4
  19. package/dist/reconciler.js +21 -11
  20. package/dist/relay-store.js +2 -0
  21. package/dist/relayd-control.js +31 -0
  22. package/dist/review-evidence.js +44 -0
  23. package/dist/review-generation-fence.js +2 -1
  24. package/dist/review-revision-execution.js +86 -0
  25. package/dist/review-revision-merge.js +15 -0
  26. package/dist/review-revision-model.js +191 -0
  27. package/dist/review-revision-policy.js +49 -0
  28. package/dist/review-revision-settlement.js +54 -0
  29. package/dist/review-revision-stale.js +57 -0
  30. package/dist/reviewer-thread.js +41 -1
  31. package/dist/runtime-status.js +13 -4
  32. package/dist/single-job-task-control.js +1 -1
  33. package/dist/task-context.js +3 -2
  34. package/dist/worker-failure-recovery.js +2 -1
  35. package/dist/workflow/dependency-revision-v2.js +16 -0
  36. package/dist/workflow/entity-creation.js +2 -0
  37. package/dist/workflow/review-v2.js +6 -2
  38. package/dist/workflow/revision-v2.js +32 -0
  39. package/dist/workflow/task-reconcile.js +3 -0
  40. package/package.json +1 -1
  41. package/skills/agents-relay/agents/job-acceptance-reviewer.agent.md +41 -0
  42. package/skills/agents-relay/agents/planner.agent.md +6 -3
  43. package/skills/agents-relay/contracts/event-contract.md +7 -0
  44. package/skills/agents-relay/contracts/task-job-contract.md +6 -0
  45. package/workflow/dependency-revision.mmd +30 -0
  46. package/workflow/review-lifecycle.mmd +40 -9
  47. package/workflow/revision-lifecycle.mmd +68 -0
package/dist/planner.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { isFinalReviewAgent } from './final-review-role.js';
1
2
  import { buildRelayWorkPrompt } from './agent-prompt-builder.js';
2
3
  import { readFile } from 'node:fs/promises';
3
4
  import { fileURLToPath } from 'node:url';
@@ -15,6 +16,7 @@ import { requiredPlannerTaskTitle } from './planner-task-title.js';
15
16
  import { parsePlannerHistoryCleanup } from './planner-history-cleanup.js';
16
17
  import { plannerTaskContext } from './planner-task-context.js';
17
18
  import { relayStoreDirectory } from './local-job-path.js';
19
+ import { validateDependencyValidity } from './dependency-validity.js';
18
20
  export function semanticTaskTree(tasks) {
19
21
  const work = tasks.filter(task => task.kind !== 'planner');
20
22
  const ids = new Set(work.map(task => task.id));
@@ -105,22 +107,22 @@ export function materializePlannerChild(job, planner, spec, executionContext) {
105
107
  const source = 'round' in planner ? planner.source : planner.planningSource ?? 'model-planner';
106
108
  const round = 'round' in planner ? planner.round : planner.planningRound ?? 1;
107
109
  const plannerHeadSha = 'round' in planner ? planner.headSha : undefined;
108
- const reviewHeadSha = spec.agentName === 'reviewer' && !(spec.dependencies?.length) ? plannerHeadSha ?? job.headSha : undefined;
110
+ const reviewHeadSha = isFinalReviewAgent(spec.agentName) && !(spec.dependencies?.length) ? plannerHeadSha ?? job.headSha : undefined;
109
111
  const resolution = spec.resolution;
110
112
  if (resolution) {
111
113
  const target = resolution.targetTaskId ? job.tasks.find(task => task.id === resolution.targetTaskId) : undefined;
112
114
  if (!target || !unresolvedTask(target))
113
115
  throw new Error(`Planner resolution for ${spec.id} must target one unresolved durable Task`);
114
116
  }
115
- const reviewerThread = spec.agentName === 'reviewer' ? prepareReviewerThreadDelivery(job, { id: spec.id, agentName: spec.agentName, reviewHeadSha }) : undefined, implementationThread = (spec.agentName === 'implementation' || spec.agentName == null) && job.implementationThreadId ? job.implementationThreadId : undefined, threadOwned = Boolean(reviewerThread || implementationThread);
116
- return createTaskEntity(job, { jobId: job.id, id: spec.id, title: spec.agentName === 'reviewer' ? 'Review' : spec.title, kind: 'work', priority: spec.priority ?? job.priority, storySize: spec.storySize ?? 'M', projectName: spec.projectName, agentName: spec.agentName, agentGraph: spec.agentGraph, review: spec.review, parentTaskId: spec.agentName === 'reviewer' ? null : spec.parentTaskId ?? null, dependencies: spec.dependencies ?? [], capabilities: spec.capabilities ?? [], workerRequirements: threadOwned ? chatgptThreadRequirements(spec.workerRequirements) : spec.workerRequirements, adapter: threadOwned ? 'chatgpt' : (spec.adapter ?? 'codex'), chatgptThreadDelivery: reviewerThread, input: spec.input, output: spec.output, continuation: spec.continuation ?? null, continuationDeliveredAt: null, attempt: 0, maxAttempts: spec.maxAttempts ?? 3, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: spec.timeoutMs ?? taskOverallTimeoutMs(spec.storySize ?? 'M'), createdAt: now, updatedAt: now, planningDecisionId: decisionId, planningSource: source, planningRound: round, reviewHeadSha, resolution: resolution ? { ...resolution, state: 'proposed', owner: 'planner', updatedAt: now } : undefined });
117
+ const reviewerThread = isFinalReviewAgent(spec.agentName) ? prepareReviewerThreadDelivery(job, { id: spec.id, agentName: spec.agentName, reviewHeadSha }) : undefined, implementationThread = (spec.agentName === 'implementation' || spec.agentName == null) && job.implementationThreadId ? job.implementationThreadId : undefined, threadOwned = Boolean(reviewerThread || implementationThread);
118
+ return createTaskEntity(job, { jobId: job.id, id: spec.id, title: isFinalReviewAgent(spec.agentName) ? 'Review' : spec.title, kind: 'work', priority: spec.priority ?? job.priority, storySize: spec.storySize ?? 'M', projectName: spec.projectName, agentName: spec.agentName, agentGraph: spec.agentGraph, review: spec.review, parentTaskId: isFinalReviewAgent(spec.agentName) ? null : spec.parentTaskId ?? null, dependencies: spec.dependencies ?? [], dependencyValidity: spec.dependencyValidity, capabilities: spec.capabilities ?? [], workerRequirements: threadOwned ? chatgptThreadRequirements(spec.workerRequirements) : spec.workerRequirements, adapter: threadOwned ? 'chatgpt' : (spec.adapter ?? 'codex'), chatgptThreadDelivery: reviewerThread, input: spec.input, output: spec.output, continuation: spec.continuation ?? null, continuationDeliveredAt: null, attempt: 0, maxAttempts: spec.maxAttempts ?? 3, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: spec.timeoutMs ?? taskOverallTimeoutMs(spec.storySize ?? 'M'), createdAt: now, updatedAt: now, planningDecisionId: decisionId, planningSource: source, planningRound: round, reviewHeadSha, resolution: resolution ? { ...resolution, state: 'proposed', owner: 'planner', updatedAt: now } : undefined });
117
119
  }
118
120
  export function planningSpec(task) {
119
121
  if (!task.output)
120
122
  throw new Error(`Initial task ${task.id} requires an output contract`);
121
123
  if (!['codex', 'chatgpt', 'z'].includes(task.adapter))
122
124
  throw new Error(`Initial task ${task.id} requires a supported worker adapter`);
123
- return { id: task.id, title: task.title, parentTaskId: task.parentTaskId, input: task.input, priority: task.priority, storySize: task.storySize, projectName: task.projectName, agentName: task.agentName, agentGraph: task.agentGraph, review: task.review, dependencies: task.dependencies, capabilities: task.capabilities, workerRequirements: task.workerRequirements, adapter: task.adapter, output: task.output ?? { kind: 'task_pr' }, routing: task.routing, continuation: task.continuation, maxAttempts: task.maxAttempts, timeoutMs: task.timeoutMs, resolution: task.resolution ? { ...task.resolution, state: undefined, owner: undefined, updatedAt: undefined } : undefined };
125
+ return { id: task.id, title: task.title, parentTaskId: task.parentTaskId, input: task.input, priority: task.priority, storySize: task.storySize, projectName: task.projectName, agentName: task.agentName, agentGraph: task.agentGraph, review: task.review, dependencies: task.dependencies, dependencyValidity: task.dependencyValidity, capabilities: task.capabilities, workerRequirements: task.workerRequirements, adapter: task.adapter, output: task.output ?? { kind: 'task_pr' }, routing: task.routing, continuation: task.continuation, maxAttempts: task.maxAttempts, timeoutMs: task.timeoutMs, resolution: task.resolution ? { ...task.resolution, state: undefined, owner: undefined, updatedAt: undefined } : undefined };
124
126
  }
125
127
  function record(value, field = 'result') {
126
128
  if (!value || typeof value !== 'object' || Array.isArray(value))
@@ -278,6 +280,8 @@ export function parsePlannerResult(value) {
278
280
  if (typeof task.input !== 'string' || task.input.length === 0)
279
281
  throw new Error(`Planner next_tasks[${index}].input is required`);
280
282
  const parentTaskId = task.parentTaskId === undefined || task.parentTaskId === null ? task.parentTaskId : optionalString(task.parentTaskId, `next_tasks[${index}].parentTaskId`);
283
+ const dependencies = stringArray(task.dependencies, `next_tasks[${index}].dependencies`);
284
+ const dependencyValidity = validateDependencyValidity(dependencies, task.dependencyValidity, `next_tasks[${index}].dependencyValidity`);
281
285
  const adapter = task.adapter;
282
286
  if (adapter !== undefined && !['codex', 'chatgpt', 'z'].includes(String(adapter)))
283
287
  throw new Error(`Planner next_tasks[${index}].adapter must be codex, chatgpt, or z when provided`);
@@ -312,7 +316,7 @@ export function parsePlannerResult(value) {
312
316
  return {
313
317
  id, title: requiredPlannerTaskTitle(task.title, index), parentTaskId, input: task.input, priority, storySize,
314
318
  projectName: optionalString(task.projectName, 'projectName'), agentName: optionalString(task.agentName, 'agentName'), agentGraph, review,
315
- dependencies: stringArray(task.dependencies, 'dependencies'), capabilities: stringArray(task.capabilities, 'capabilities'), workerRequirements: requirements,
319
+ dependencies, dependencyValidity, capabilities: stringArray(task.capabilities, 'capabilities'), workerRequirements: requirements,
316
320
  adapter: adapter, output: output, routing: route,
317
321
  continuation: task.continuation, maxAttempts, timeoutMs, resolution: resolutionProposal(task.resolution, `next_tasks[${index}].resolution`)
318
322
  };
@@ -322,7 +326,7 @@ export function parsePlannerResult(value) {
322
326
  export function validatePlannerProgress(job, result) {
323
327
  if (result.objective_status !== 'in_progress' || result.next_tasks.length > 0 || result.unblocks.length > 0)
324
328
  return;
325
- const previousReviewFinished = job.tasks.some(task => task.agentName === 'reviewer' && task.state === 'SUCCEEDED');
329
+ const previousReviewFinished = job.tasks.some(task => isFinalReviewAgent(task.agentName) && task.state === 'SUCCEEDED');
326
330
  if (previousReviewFinished)
327
331
  return;
328
332
  const liveWork = job.tasks.some(task => task.kind !== 'planner' && !['SUCCEEDED', 'FAILED', 'CANCELLED'].includes(task.state));
@@ -330,6 +334,7 @@ export function validatePlannerProgress(job, result) {
330
334
  return;
331
335
  throw new Error('Planner returned in_progress with no executable tasks or unblocks while no live work remains; return satisfied when only Relay-owned review/merge/completion effects remain');
332
336
  }
337
+ export { validatePlannerAgentRoles } from './planner-agent-roles.js';
333
338
  export function validatePlannerLifecycleOwnership(job, specs) {
334
339
  if (!job.localMerge?.sourceRef)
335
340
  return;
@@ -1,3 +1,6 @@
1
+ import { settleReviewRevisionRound } from './review-revision-settlement.js';
2
+ import { isFinalReviewAgent, FINAL_REVIEW_AGENT, nextFinalReviewTaskId } from './final-review-role.js';
3
+ import { normalizeReviewEvidence } from './review-evidence.js';
1
4
  import { browserWorkerPool } from './browser-worker-runtime.js';
2
5
  import { storySizeTimeoutMs, taskOverallTimeoutMs } from './types.js';
3
6
  import { completionGateSatisfied, refreshTaskDependencies, transitionTaskEvent, tryTransitionTaskEvent } from './task-transitions.js';
@@ -8,11 +11,14 @@ import { routeExecution } from './execution-routing.js';
8
11
  import { recordRouteOutcome } from './route-outcome-recording.js';
9
12
  import { ReconcilerRuntimeBase } from './reconciler-runtime.js';
10
13
  import { dispatchReviewLifecycle, reviewOutcome } from './workflow/review-v2.js';
14
+ import { staleReviewRevisions } from './review-revision-stale.js';
11
15
  import { dispatchTaskLifecycleSync } from './workflow/lifecycle.js';
12
16
  import { createTaskEntity } from './workflow/entity-creation.js';
13
17
  import { localSourceHead, localWorkingHead } from './local-git-merge.js';
14
18
  import { chatgptThreadRequirements, resolveReviewerThreadDestination, resolveImplementationTaskThreadDestination, prepareReviewerThreadDelivery } from './reviewer-thread.js';
15
19
  import { reviewGenerationMatches } from './review-generation-fence.js';
20
+ import { targetedRequestsForReview, targetedRequestsCoverReview } from './review-revision-model.js';
21
+ import { reviewFindingFingerprint } from './review-revision-policy.js';
16
22
  import { codexNoStartFallbackRoute, quarantineUnavailableCodexFallback } from './chatgpt-platform-fallback.js';
17
23
  export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
18
24
  async currentHeadSha(job) {
@@ -36,7 +42,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
36
42
  }
37
43
  }
38
44
  reviewFacts(job, headSha) {
39
- const reviewTasks = job.tasks.filter(task => task.agentName === 'reviewer' && task.reviewHeadSha === headSha);
45
+ const reviewTasks = job.tasks.filter(task => isFinalReviewAgent(task.agentName) && task.reviewHeadSha === headSha);
40
46
  const currentReviewTask = job.review?.taskId ? job.tasks.find(task => task.id === job.review?.taskId) : undefined;
41
47
  return {
42
48
  reviewEnabled: job.reviewEnabled !== false,
@@ -49,45 +55,6 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
49
55
  noApprovedCurrentReview: !reviewTasks.some(task => task.state === 'SUCCEEDED' && job.review?.headSha === headSha && job.review.outcome === 'approved'),
50
56
  };
51
57
  }
52
- static reviewRecord(value) {
53
- return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
54
- }
55
- static reviewHeadSha(event) {
56
- const data = ReconcilerReviewBase.reviewRecord(event.data);
57
- const outcome = ReconcilerReviewBase.reviewRecord(data.outcome);
58
- const review = ReconcilerReviewBase.reviewRecord(data.review);
59
- return [outcome.head_sha, outcome.headSha, review.head_sha, review.headSha, data.head_sha, data.headSha]
60
- .find((value) => typeof value === 'string' && value.length > 0);
61
- }
62
- static reviewIssues(event) {
63
- const data = ReconcilerReviewBase.reviewRecord(event.data);
64
- const outcome = ReconcilerReviewBase.reviewRecord(data.outcome);
65
- const review = ReconcilerReviewBase.reviewRecord(data.review);
66
- const rawIssues = outcome.blocking_findings !== undefined ? outcome.blocking_findings
67
- : outcome.blockingFindings !== undefined ? outcome.blockingFindings
68
- : review.issues !== undefined ? review.issues
69
- : data.issues;
70
- if (!Array.isArray(rawIssues))
71
- return [];
72
- return rawIssues.map(item => {
73
- if (typeof item === 'string')
74
- return item.trim();
75
- if (!item || typeof item !== 'object' || Array.isArray(item))
76
- return '';
77
- const value = item;
78
- return (typeof value.summary === 'string' ? value.summary
79
- : typeof value.message === 'string' ? value.message
80
- : typeof value.finding === 'string' ? value.finding
81
- : typeof value.title === 'string' ? value.title : '').trim();
82
- }).filter(Boolean);
83
- }
84
- static normalizeReviewEvidence(event, task) {
85
- const explicitHeadSha = ReconcilerReviewBase.reviewHeadSha(event);
86
- const headSha = explicitHeadSha ?? (event.type === 'review.approved' ? task.reviewHeadSha : undefined);
87
- if (!headSha)
88
- return null;
89
- return { headSha, issues: ReconcilerReviewBase.reviewIssues(event) };
90
- }
91
58
  async cancelStaleReviewTask(job) {
92
59
  const staleTask = job.review?.taskId ? job.tasks.find(task => task.id === job.review?.taskId) : undefined;
93
60
  if (!staleTask || !['DRAFT', 'QUEUED', 'RUNNING'].includes(staleTask.state))
@@ -100,11 +67,14 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
100
67
  await this.store.saveTask(staleTask);
101
68
  }
102
69
  async invalidateStaleReview(job, headSha) {
103
- if (!headSha || !job.review || job.review.headSha === headSha)
70
+ const staleReview = job.review;
71
+ if (!headSha || !staleReview || staleReview.headSha === headSha)
104
72
  return;
105
- const decision = await dispatchReviewLifecycle(job.review.outcome, 'head.changed', {}, async (actionId) => {
73
+ const decision = await dispatchReviewLifecycle(staleReview.outcome, 'head.changed', {}, async (actionId) => {
106
74
  if (actionId === 'review.cancelStale') {
107
75
  await this.cancelStaleReviewTask(job);
76
+ if (staleReview.taskId)
77
+ await staleReviewRevisions(this.store, job, staleReview.taskId, staleReview.headSha, (taskId, executionId) => this.cancelExecutionGeneration(job.id, taskId, executionId));
108
78
  return {};
109
79
  }
110
80
  throw new Error('Unsupported stale review action ' + actionId);
@@ -114,33 +84,32 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
114
84
  const outcome = reviewOutcome(decision.target);
115
85
  if (!outcome)
116
86
  throw new Error('Review graph produced invalid stale target ' + decision.target);
117
- job.review = { ...job.review, outcome, updatedAt: new Date().toISOString() };
118
- await this.store.saveJob(job);
119
- }
120
- nextFinalReviewTaskId(job, headSha) {
121
- const base = 'final-review-' + headSha.slice(0, 12);
122
- const ids = new Set(job.tasks.filter(task => task.reviewHeadSha === headSha && task.agentName === 'reviewer').map(task => task.id));
123
- if (!ids.has(base))
124
- return base;
125
- for (let round = 2; round < 1000; round += 1) {
126
- const candidate = base + '-r' + round;
127
- if (!ids.has(candidate))
128
- return candidate;
87
+ const updatedAt = new Date().toISOString();
88
+ if (this.store.mutateJob) {
89
+ const persisted = await this.store.mutateJob(job.id, current => {
90
+ const currentReview = current.review;
91
+ if (!currentReview || currentReview.taskId !== staleReview.taskId || currentReview.headSha !== staleReview.headSha)
92
+ return current;
93
+ current.review = { ...currentReview, outcome, updatedAt };
94
+ current.updatedAt = updatedAt;
95
+ return current;
96
+ });
97
+ Object.assign(job, persisted);
98
+ }
99
+ else {
100
+ job.review = { ...staleReview, outcome, updatedAt };
101
+ await this.store.saveJob(job);
129
102
  }
130
- throw new Error('Too many final review rounds for ' + headSha);
131
- }
132
- externalReviewPrNumber(job) {
133
- return job.prNumber;
134
103
  }
135
104
  async createFinalReviewTask(job, headSha) {
136
- const id = this.nextFinalReviewTaskId(job, headSha);
137
- const reviewPrNumber = this.externalReviewPrNumber(job);
105
+ const id = nextFinalReviewTaskId(job, headSha);
106
+ const reviewPrNumber = job.prNumber;
138
107
  const now = new Date().toISOString();
139
108
  const reviewGateTasks = implementationTasks(job);
140
109
  const reviewThread = resolveReviewerThreadDestination(job, this.options.reviewer?.threadId);
141
110
  const reviewerRouting = await this.selectReviewer(reviewGateTasks, reviewThread ? chatgptThreadRequirements(this.options.reviewer?.requirements) : undefined);
142
111
  const chatgptThreadDelivery = prepareReviewerThreadDelivery(job, {
143
- id, agentName: 'reviewer', reviewHeadSha: headSha, routing: reviewerRouting.candidate.routing,
112
+ id, agentName: FINAL_REVIEW_AGENT, reviewHeadSha: headSha, routing: reviewerRouting.candidate.routing,
144
113
  }, this.options.reviewer?.threadId);
145
114
  const input = [
146
115
  `Job ID: ${job.id}`,
@@ -154,7 +123,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
154
123
  'Do not treat historical failed attempts as current artifact defects; distinguish preserved baseline files from implementation.',
155
124
  ].join('\n\n');
156
125
  const task = createTaskEntity(job, {
157
- jobId: job.id, id, title: 'Review', kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title, agentName: 'reviewer',
126
+ jobId: job.id, id, title: 'Review', kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title, agentName: FINAL_REVIEW_AGENT,
158
127
  parentTaskId: null, dependencies: reviewGateTasks.map(item => item.id), capabilities: ['review'],
159
128
  workerSelection: reviewerRouting.selection, adapter: reviewerRouting.candidate.adapter,
160
129
  input,
@@ -165,7 +134,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
165
134
  error: null, timeoutMs: this.options.reviewer?.timeoutMs ?? storySizeTimeoutMs('M'), createdAt: now, updatedAt: now
166
135
  });
167
136
  await this.store.appendTask(task);
168
- await this.emit(eventFor(job.id, id, task.parentTaskId, 'review.created', 'queued', 'Final review task ' + id + ' created for ' + headSha + ' using ' + reviewerRouting.reason, 'orchestrator', { headSha, agentName: 'reviewer', reviewerRouting: { workerId: reviewerRouting.selection.workerId, reason: reviewerRouting.reason, selectedBy: reviewerRouting.selection.selectedBy } }));
137
+ await this.emit(eventFor(job.id, id, task.parentTaskId, 'review.created', 'queued', 'Final review task ' + id + ' created for ' + headSha + ' using ' + reviewerRouting.reason, 'orchestrator', { headSha, agentName: FINAL_REVIEW_AGENT, reviewerRouting: { workerId: reviewerRouting.selection.workerId, reason: reviewerRouting.reason, selectedBy: reviewerRouting.selection.selectedBy } }));
169
138
  return id;
170
139
  }
171
140
  async projectedReviewHeadReady(job, headSha) {
@@ -185,11 +154,12 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
185
154
  async ensureFinalReview(job, headSha) {
186
155
  if (headSha && !(await this.projectedReviewHeadReady(job, headSha)))
187
156
  return;
157
+ job = await settleReviewRevisionRound(this.store, job);
188
158
  // Restore the review gate only after an authoritative unblock of the original reviewer.
189
159
  const priorReviewTask = job.tasks.find(task => task.id === job.review?.taskId);
190
160
  if (job.review?.outcome === 'blocked' && job.review.headSha === headSha
191
- && priorReviewTask?.agentName === 'reviewer' && priorReviewTask.unblock?.event === 'task.unblocked'
192
- && ['QUEUED', 'RUNNING', 'FAILED'].includes(priorReviewTask.state)) {
161
+ && isFinalReviewAgent(priorReviewTask?.agentName) && priorReviewTask?.unblock?.event === 'task.unblocked'
162
+ && ['QUEUED', 'RUNNING', 'FAILED'].includes(priorReviewTask?.state ?? '')) {
193
163
  const recovered = await dispatchReviewLifecycle('blocked', 'review.retry', { reviewUnblocked: true });
194
164
  if (recovered.accepted && recovered.target === 'PENDING') {
195
165
  job.review = { ...job.review, outcome: 'pending', updatedAt: new Date().toISOString() };
@@ -271,7 +241,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
271
241
  }
272
242
  async routeTaskForExecution(job, task) {
273
243
  const implementationThread = resolveImplementationTaskThreadDestination(job, task);
274
- const reviewerThread = task.agentName === 'reviewer' ? resolveReviewerThreadDestination(job, this.options.reviewer?.threadId) : null;
244
+ const reviewerThread = isFinalReviewAgent(task.agentName) ? resolveReviewerThreadDestination(job, this.options.reviewer?.threadId) : null;
275
245
  if (task.routing && !((implementationThread || reviewerThread) && task.adapter !== 'chatgpt'))
276
246
  return { task, routed: false };
277
247
  if (!task.output || task.adapter === 'orchestrator')
@@ -293,7 +263,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
293
263
  id: job.id, title: job.title, objective: job.objective ?? null,
294
264
  description: job.description ?? null, priority: job.priority ?? null,
295
265
  repository: job.repository,
296
- prNumber: this.externalReviewPrNumber(job), state: job.state,
266
+ prNumber: job.prNumber, state: job.state,
297
267
  },
298
268
  task: {
299
269
  id: task.id, kind: task.kind ?? 'work', storySize: task.storySize ?? 'M',
@@ -369,10 +339,10 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
369
339
  }
370
340
  async applyReviewEvent(event) {
371
341
  const job = await this.store.load(event.job_id);
372
- const task = job.tasks.find(item => item.id === event.task_id && item.agentName === 'reviewer');
342
+ const task = job.tasks.find(item => item.id === event.task_id && isFinalReviewAgent(item.agentName));
373
343
  if (!task)
374
344
  return { applied: false, reconcile: false, reason: event.type + '.ignored' };
375
- const normalizedEvidence = ReconcilerReviewBase.normalizeReviewEvidence(event, task);
345
+ const normalizedEvidence = normalizeReviewEvidence(event, task);
376
346
  if (!normalizedEvidence)
377
347
  return { applied: false, reconcile: false, reason: event.type + '.ignored' };
378
348
  const headSha = normalizedEvidence.headSha;
@@ -381,6 +351,13 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
381
351
  const currentHeadSha = await this.currentHeadSha(job);
382
352
  if (currentHeadSha ? currentHeadSha !== headSha : Boolean(job.headSha && job.headSha !== headSha))
383
353
  return { applied: false, reconcile: false, reason: event.type + '.stale' };
354
+ // Reviewer attempts may restart at the same SHA. Graph-stale requests
355
+ // from prior execution generations before accepting this generation's
356
+ // verdict; otherwise their DRAFT children can block approval forever.
357
+ if (task.executionId && job.reviewRevisionRequests?.some(request => request.reviewTaskId === task.id && request.reviewHeadSha === headSha
358
+ && request.reviewExecutionId !== task.executionId && request.status !== 'stale')) {
359
+ await staleReviewRevisions(this.store, job, task.id, headSha, (taskId, executionId) => this.cancelExecutionGeneration(job.id, taskId, executionId), task.executionId);
360
+ }
384
361
  // Planner-created reviewer tasks predate the final-review Job gate. Bind
385
362
  // their first trustworthy review event to PENDING before dispatching it.
386
363
  const freshAfterStale = job.review?.outcome === 'stale'
@@ -402,22 +379,19 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
402
379
  await this.store.saveTask(task);
403
380
  }
404
381
  let needsReconcile = false;
405
- let pendingFixTask = null;
406
- const reviewDecision = await dispatchReviewLifecycle(initialReviewOutcome, event.type, { autoMerge: job.autoMerge !== false }, async (actionId) => {
407
- if (actionId === 'review.createFix') {
382
+ let revisionDisposition;
383
+ const reviewDecision = await dispatchReviewLifecycle(initialReviewOutcome, event.type, { autoMerge: job.autoMerge !== false, targetedRevisionRequestsReady: targetedRequestsCoverReview(job, task, headSha, normalizedEvidence.issues) }, async (actionId) => {
384
+ if (actionId === 'review.awaitTargetedRevisions') {
385
+ revisionDisposition = 'targeted';
386
+ // Subsequent revision child scheduling is owned by the revision Graph;
387
+ // the review verdict never creates an unowned generic fix.
408
388
  needsReconcile = true;
409
- const issues = normalizedEvidence.issues;
410
- if (issues.length === 0)
411
- issues.push(event.message || 'Address the reviewer-requested changes');
412
- const now = event.timestamp || new Date().toISOString();
413
- const id = 'review-fix-' + headSha.slice(0, 8);
414
- if (!job.tasks.some(item => item.id === id)) {
415
- const fixPrNumber = this.externalReviewPrNumber(job);
416
- const fixTarget = fixPrNumber > 0 ? `PR #${fixPrNumber}` : `Job ${job.id} artifact`;
417
- const input = 'Address all reviewer findings for ' + fixTarget + ' at ' + headSha + ':\n\n' + issues.map((issue, index) => (index + 1) + '. ' + issue).join('\n');
418
- const fixTask = createTaskEntity(job, { jobId: job.id, id, title: `Fix review ${headSha.slice(0, 8)}`, kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title, agentName: 'implementation', parentTaskId: task.id, dependencies: [task.id], capabilities: ['implementation'], workerRequirements: { capabilities: [] }, adapter: 'codex', input, output: { kind: 'task_pr' }, continuation: null, continuationDeliveredAt: null, attempt: 0, maxAttempts: 3, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: 0, createdAt: now, updatedAt: now });
419
- pendingFixTask = fixTask;
420
- }
389
+ return {};
390
+ }
391
+ if (actionId === 'review.requireOwnerResolution') {
392
+ revisionDisposition = 'needs-ownership';
393
+ // An explicitly authorized Planner re-plan may resolve ownership,
394
+ // but there is no implicit generic fix or automatic escalation.
421
395
  return {};
422
396
  }
423
397
  if (actionId === 'review.requestMerge') {
@@ -445,6 +419,13 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
445
419
  if (!freshTask || !reviewGenerationMatches(current, job, task, headSha))
446
420
  return current;
447
421
  const candidate = structuredClone(freshTask);
422
+ // The graph verdict was decided on the outer snapshot. Never commit a
423
+ // different disposition if concurrent intake changed the requests.
424
+ if (event.type === 'review.changes_required'
425
+ && targetedRequestsCoverReview(current, freshTask, headSha, normalizedEvidence.issues)
426
+ !== (revisionDisposition === 'targeted'))
427
+ return current;
428
+ const requestIds = targetedRequestsForReview(current, freshTask, headSha).map(item => item.requestId);
448
429
  const freshDecision = tryTransitionTaskEvent(candidate, event.type);
449
430
  if (!freshDecision.accepted || !freshDecision.target)
450
431
  return current;
@@ -466,9 +447,18 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
466
447
  freshTask.error = null;
467
448
  if (freshDecision.target !== 'RUNNING')
468
449
  freshTask.result = { summary: event.message || `Review ${event.type}`, data: event.data ?? {} };
469
- if (pendingFixTask && !current.tasks.some(item => item.id === pendingFixTask.id))
470
- current.tasks.push(structuredClone(pendingFixTask));
471
- current.review = { outcome, headSha, taskId: freshTask.id, evidence, updatedAt: reviewUpdatedAt };
450
+ current.review = { outcome, headSha, taskId: freshTask.id, evidence, updatedAt: reviewUpdatedAt,
451
+ ...(revisionDisposition ? { revisionDisposition } : {}) };
452
+ if ((event.type === 'review.changes_required' || event.type === 'review.approved') && terminalExecutionId
453
+ && !current.reviewRevisionRounds?.some(round => round.reviewTaskId === freshTask.id && round.reviewExecutionId === terminalExecutionId)) {
454
+ current.reviewRevisionRounds = [...(current.reviewRevisionRounds ?? []), {
455
+ reviewTaskId: freshTask.id, reviewExecutionId: terminalExecutionId, headSha,
456
+ requestIds,
457
+ status: outcome === 'approved' ? 'approved' : 'changes_required',
458
+ findingFingerprint: reviewFindingFingerprint(normalizedEvidence.issues),
459
+ recordedAt: reviewUpdatedAt,
460
+ }];
461
+ }
472
462
  current.updatedAt = reviewUpdatedAt;
473
463
  committed = true;
474
464
  return current;
@@ -480,17 +470,9 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
480
470
  if (terminalExecutionId) {
481
471
  this.finalizeReviewExecution(job.id, { ...task, executionId: terminalExecutionId }, event);
482
472
  }
483
- const committedFixTask = pendingFixTask;
484
- if (committedFixTask)
485
- await this.emit(eventFor(job.id, committedFixTask.id, task.id, 'review.fix_task_created', 'queued', 'Created one fix task ' + committedFixTask.id + ' for reviewer findings', 'orchestrator', { headSha }, { agent: 'relay', component: 'agents-relay' }));
486
473
  }
487
474
  else {
488
- const legacyFixTask = pendingFixTask;
489
- if (legacyFixTask) {
490
- await this.store.appendTask(legacyFixTask);
491
- await this.emit(eventFor(job.id, legacyFixTask.id, task.id, 'review.fix_task_created', 'queued', 'Created one fix task ' + legacyFixTask.id + ' for reviewer findings', 'orchestrator', { headSha }, { agent: 'relay', component: 'agents-relay' }));
492
- }
493
- job.review = { outcome, headSha, taskId: task.id, evidence, updatedAt: reviewUpdatedAt };
475
+ job.review = { outcome, headSha, taskId: task.id, evidence, updatedAt: reviewUpdatedAt, ...(revisionDisposition ? { revisionDisposition } : {}) };
494
476
  job.updatedAt = reviewUpdatedAt;
495
477
  await this.store.saveTask(task);
496
478
  await this.store.saveJob(job);
@@ -1,3 +1,5 @@
1
+ import { dependencyRevisionStillCurrent } from './dependency-revision-execution.js';
2
+ import { isFinalReviewAgent } from './final-review-role.js';
1
3
  import { handleWorkerLaunchFailure } from './worker-failure-recovery.js';
2
4
  import { normalizeReviewerTerminalEvent } from './review-terminal-normalization.js';
3
5
  import { executionEventSource, eventSourceId, executionIdFromSource, claimTerminalExecution, terminalExecutionClaimed } from './execution-event-identity.js';
@@ -88,8 +90,15 @@ export class ReconcilerRuntimeBase {
88
90
  if (event.type === 'task.progress')
89
91
  return this.markWorkerProgress(event);
90
92
  if (event.type === 'task.completed') {
91
- const task = (await this.store.load(event.job_id)).tasks.find(item => item.id === event.task_id);
92
- const normalized = task?.agentName === 'reviewer' ? normalizeReviewerTerminalEvent(event) : null;
93
+ const latest = await this.store.load(event.job_id);
94
+ const task = latest.tasks.find(item => item.id === event.task_id);
95
+ // Source generation still goes through canonical Task terminal
96
+ // correlation; convert stale verification into a safe supersede event.
97
+ if (task?.revision && task.revision.kind !== 'targeted' && !dependencyRevisionStillCurrent(latest, task)) {
98
+ return this.applyTerminalEvent({ ...event, type: 'task.cancelled',
99
+ message: 'Superseded upstream dependency evidence vector changed before terminal validation' });
100
+ }
101
+ const normalized = isFinalReviewAgent(task?.agentName) ? normalizeReviewerTerminalEvent(event) : null;
93
102
  if (normalized)
94
103
  return normalized.type === 'task.failed' ? this.applyTerminalEvent(normalized) : this.applyReviewEvent(normalized);
95
104
  }
@@ -401,7 +410,7 @@ export class ReconcilerRuntimeBase {
401
410
  return false;
402
411
  if (event.type === 'task.blocked' && lifecycleEvent !== 'interactive.waiting' && (!trustedInternal || task.agentName !== 'troubleshooter'))
403
412
  return false;
404
- if (task.agentName === 'reviewer' && event.type === 'task.completed')
413
+ if (isFinalReviewAgent(task.agentName) && event.type === 'task.completed')
405
414
  return false;
406
415
  if (event.type === 'task.completed' && task.interactiveInvocation?.status !== undefined && task.interactiveInvocation.status !== 'approved')
407
416
  return false; // current interactive revision requires durable approval
@@ -477,7 +486,7 @@ export class ReconcilerRuntimeBase {
477
486
  }
478
487
  if (event.type === 'task.completed')
479
488
  await this.deliverContinuation(transition.job, transition.task);
480
- const reviewWorker = transition.task.agentName === 'reviewer';
489
+ const reviewWorker = isFinalReviewAgent(transition.task.agentName);
481
490
  return { applied: true, reconcile: lifecycleEvent !== 'interactive.waiting' && (!reviewWorker || event.type === 'task.failed'), reason: reviewWorker ? `${event.type}.review-worker` : event.type, reconcileMode: reviewWorker || lifecycleEvent === 'interactive.waiting' ? undefined : 'detached' };
482
491
  }
483
492
  terminalWait(taskId, executionId, launchBarrier) {
@@ -1,3 +1,6 @@
1
+ import { revisionRequestReady, reconcileReviewRevisions } from './review-revision-execution.js';
2
+ import { reconcileDependencyRevisions } from './dependency-revision-execution.js';
3
+ import { isFinalReviewAgent } from './final-review-role.js';
1
4
  import { deliverPendingEscalations } from './escalation-notifier.js';
2
5
  import { createFailedPlanRecovery } from './planner-recovery.js';
3
6
  import { recoverPlannerChildren } from './planner-child-recovery.js';
@@ -18,7 +21,7 @@ import { retryPendingPlannerUnblocks } from './planner-runtime.js';
18
21
  import { dispatchPlannerOrchestration, plannerOrchestrationFacts } from './workflow/planner-orchestration-v2.js';
19
22
  import { ReconcilerReviewBase } from './reconciler-review.js';
20
23
  import { executeForceRestate } from './force-restate.js';
21
- import { recordThreadDelivery, resolveImplementationTaskThreadDestination, prepareReviewerThreadDelivery, resolveReviewerThreadDestination } from './reviewer-thread.js';
24
+ import { recordThreadDelivery, resolveImplementationTaskThreadDestination, prepareRevisionThreadDelivery, prepareReviewerThreadDelivery, resolveReviewerThreadDestination } from './reviewer-thread.js';
22
25
  import { executeManualPlan } from './manual-plan.js';
23
26
  import { executionEventSource, withExecutionBoundary } from './reconciler-runtime.js';
24
27
  export { executionEventSource } from './reconciler-runtime.js';
@@ -70,7 +73,7 @@ export class Reconciler extends ReconcilerReviewBase {
70
73
  }
71
74
  const capacity = Math.max(0, (this.options.maxConcurrent ?? 4) - this.live.size - this.plannerLive.size);
72
75
  const dispatchable = (jobHasActiveExecution(scheduled) ? [] : scheduled.tasks)
73
- .filter(task => task.state === 'QUEUED'
76
+ .filter(task => revisionRequestReady(scheduled, task) && task.state === 'QUEUED'
74
77
  && task.executionId === null
75
78
  && task.kind !== 'planner'
76
79
  && task.adapter !== 'orchestrator'
@@ -183,6 +186,8 @@ export class Reconciler extends ReconcilerReviewBase {
183
186
  this.cancelExecutionGeneration(job.id, task.id, task.executionId ?? task.executionHistory?.at(-1)?.id);
184
187
  this.plannerLive.get(task.id)?.controller.abort();
185
188
  }
189
+ await reconcileReviewRevisions(this.store, jobId);
190
+ await reconcileDependencyRevisions(this.store, jobId);
186
191
  const beforeSchedule = await this.store.load(jobId);
187
192
  const taskStatesBeforeSchedule = new Map(beforeSchedule.tasks.map(task => [task.id, task.state]));
188
193
  let scheduled = refreshTaskDependencies(beforeSchedule);
@@ -355,16 +360,17 @@ export class Reconciler extends ReconcilerReviewBase {
355
360
  const claimedTask = await withExecutionBoundary(job.id, '__job_execution_slot__', async () => {
356
361
  const freshJob = await this.store.load(job.id);
357
362
  let freshTask = freshJob.tasks.find(item => item.id === task.id);
358
- if (!freshTask || freshTask.state !== 'QUEUED' || !dependencyReady(freshTask, new Map(freshJob.tasks.map(item => [item.id, item]))))
363
+ if (!freshTask || freshTask.state !== 'QUEUED' || !revisionRequestReady(freshJob, freshTask)
364
+ || !dependencyReady(freshTask, new Map(freshJob.tasks.map(item => [item.id, item]))))
359
365
  return;
360
366
  if (freshTask.executionId !== null)
361
367
  return;
362
368
  if (jobHasActiveExecution(freshJob, { taskId: freshTask.id }))
363
369
  return;
364
- if (freshTask.agentName === 'reviewer' && freshTask.planningDecisionId && freshTask.dependencies.length)
370
+ if (isFinalReviewAgent(freshTask.agentName) && freshTask.planningDecisionId && freshTask.dependencies.length)
365
371
  await bindPlannedReviewHead(this.store, freshTask, await this.currentHeadSha(freshJob));
366
372
  const implementationThread = resolveImplementationTaskThreadDestination(freshJob, freshTask);
367
- if ((!freshTask.routing || ((implementationThread || (freshTask.agentName === 'reviewer' && resolveReviewerThreadDestination(freshJob, this.options.reviewer?.threadId))) && freshTask.adapter !== 'chatgpt')) && freshTask.adapter !== 'orchestrator') {
373
+ if ((!freshTask.routing || ((implementationThread || (isFinalReviewAgent(freshTask.agentName) && resolveReviewerThreadDestination(freshJob, this.options.reviewer?.threadId))) && freshTask.adapter !== 'chatgpt')) && freshTask.adapter !== 'orchestrator') {
368
374
  const routed = await this.routeTaskForExecutionFailClosed(freshJob, freshTask);
369
375
  if (!routed)
370
376
  return;
@@ -387,9 +393,11 @@ export class Reconciler extends ReconcilerReviewBase {
387
393
  attempt: freshTask.attempt,
388
394
  startedAt: new Date(startedAt).toISOString(),
389
395
  }].slice(-8);
390
- if (freshTask.agentName === 'reviewer')
396
+ if (isFinalReviewAgent(freshTask.agentName))
391
397
  freshTask.chatgptThreadDelivery = prepareReviewerThreadDelivery(freshJob, freshTask, this.options.reviewer?.threadId);
392
- if (implementationThread && freshTask.adapter === 'chatgpt') {
398
+ if (freshTask.revision?.kind === 'targeted')
399
+ freshTask.chatgptThreadDelivery = prepareRevisionThreadDelivery(freshJob, freshTask);
400
+ if (implementationThread && !freshTask.revision && freshTask.adapter === 'chatgpt') {
393
401
  freshTask.chatgptThreadDelivery = {
394
402
  kind: 'new-turn', threadId: implementationThread, threadSource: 'implementation',
395
403
  requestId: `${freshJob.id}:${freshTask.id}:${freshTask.executionId}`,
@@ -401,7 +409,7 @@ export class Reconciler extends ReconcilerReviewBase {
401
409
  let claimed;
402
410
  await this.store.mutateJob(job.id, current => {
403
411
  const durable = current.tasks.find(item => item.id === freshTask.id);
404
- if (!durable || durable.state !== 'QUEUED' || durable.executionId !== null
412
+ if (!durable || durable.state !== 'QUEUED' || !revisionRequestReady(current, durable) || durable.executionId !== null
405
413
  || !dependencyReady(durable, new Map(current.tasks.map(item => [item.id, item]))))
406
414
  return current;
407
415
  if (freshTask.routing)
@@ -419,9 +427,11 @@ export class Reconciler extends ReconcilerReviewBase {
419
427
  id: durable.executionId, attempt: durable.attempt, startedAt: new Date(startedAt).toISOString(),
420
428
  }].slice(-8);
421
429
  const implementationThread = resolveImplementationTaskThreadDestination(current, durable);
422
- if (durable.agentName === 'reviewer')
430
+ if (isFinalReviewAgent(durable.agentName))
423
431
  durable.chatgptThreadDelivery = prepareReviewerThreadDelivery(current, { ...durable, routing: freshTask.routing }, this.options.reviewer?.threadId);
424
- if (implementationThread && durable.adapter === 'chatgpt') {
432
+ if (durable.revision?.kind === 'targeted')
433
+ durable.chatgptThreadDelivery = prepareRevisionThreadDelivery(current, durable);
434
+ if (implementationThread && !durable.revision && durable.adapter === 'chatgpt') {
425
435
  durable.chatgptThreadDelivery = {
426
436
  kind: 'new-turn', threadId: implementationThread, threadSource: 'implementation',
427
437
  requestId: `${current.id}:${durable.id}:${durable.executionId}`,
@@ -452,7 +462,7 @@ export class Reconciler extends ReconcilerReviewBase {
452
462
  }
453
463
  let executionContext;
454
464
  try {
455
- const role = task.agentName === 'reviewer' ? 'reviewer' : task.agentName === 'troubleshooter' ? 'troubleshooter' : task.parentTaskId ? 'nested-worker' : 'worker';
465
+ const role = isFinalReviewAgent(task.agentName) ? 'reviewer' : task.agentName === 'troubleshooter' ? 'troubleshooter' : task.parentTaskId ? 'nested-worker' : 'worker';
456
466
  const projectPath = this.options.projectPathForJob ? await this.options.projectPathForJob(job, task) : task.routing?.cwd ?? process.cwd();
457
467
  executionContext = await this.resolvedContext(job, task, role, projectPath);
458
468
  }
@@ -1,6 +1,7 @@
1
1
  import { currentJobMetadata, loadRelayJob, listRelayJobs } from './relay-job-snapshot-reads.js';
2
2
  import { SQLiteWorkflowOperations } from './relay-workflow-operations.js';
3
3
  import { preserveTaskComments } from './task-comments.js';
4
+ import { preserveReviewRevisionHistory } from './review-revision-merge.js';
4
5
  import { DatabaseSync } from 'node:sqlite';
5
6
  import { migrateLegacyBlockedTasks } from './legacy-blocked-task-migration.js';
6
7
  import { dirname } from 'node:path';
@@ -31,6 +32,7 @@ function mergeRecords(local, remote) {
31
32
  export function mergeInboundJobSnapshot(local, remote) {
32
33
  const base = remote.updatedAt > local.updatedAt ? structuredClone(remote) : structuredClone(local);
33
34
  base.tasks = preserveTaskComments(local.tasks, mergeRecords(local.tasks, remote.tasks));
35
+ preserveReviewRevisionHistory(local, base);
34
36
  const localPlans = local.plans ?? [];
35
37
  const remotePlans = remote.plans ?? [];
36
38
  if (localPlans.length > 0 || remotePlans.length > 0) {
@@ -1,3 +1,5 @@
1
+ import { submitTargetedRevisionRequest } from './review-revision-model.js';
2
+ import { localSourceHead, localWorkingHead } from './local-git-merge.js';
1
3
  import { appendTaskComment } from './task-comments.js';
2
4
  import { InMemoryStore } from './store.js';
3
5
  import { openLocalManagedStore } from './local-managed-store.js';
@@ -7,6 +9,7 @@ import { publishTaskBlocked } from './cli-support.js';
7
9
  import { classifyFailedTask, supersedeCancelledTask } from './task-actions.js';
8
10
  import { requestTroubleshooterEscalation, resumeTroubleshooter } from './task-recovery.js';
9
11
  import { adoptExistingPullRequestJob } from './cli-job-create.js';
12
+ import { resolveManagedProjectPath, resolveRepositoryProjectPath } from './workspace.js';
10
13
  export function createWorkspaceControl(deps) {
11
14
  const { client, trusted, noGitHub, repositories, refreshAll, requireLocalJobBinding, makeReconciler, concurrency, pool, bus, isEffectivelyBlocked, unblockTask, publishTaskUnblocked, dispatchTaskAction, registerBlockerDependency, discoverAgents, ensureManagedGitHubJob } = deps;
12
15
  const workspaceControl = async (body) => {
@@ -137,6 +140,34 @@ export function createWorkspaceControl(deps) {
137
140
  await pool.reconcileLocalJob(jobId, 'control.job.unblock');
138
141
  return await store.load(jobId);
139
142
  }
143
+ if (command === 'task.revise') {
144
+ const repository = typeof body.repository === 'string' ? body.repository : '';
145
+ const originalTaskId = typeof body.taskId === 'string' ? body.taskId : '';
146
+ const reviewTaskId = typeof body.reviewTaskId === 'string' ? body.reviewTaskId : '';
147
+ const reviewExecutionId = typeof body.reviewExecutionId === 'string' ? body.reviewExecutionId : '';
148
+ const headSha = typeof body.headSha === 'string' ? body.headSha : '';
149
+ const requestId = typeof body.requestId === 'string' ? body.requestId : '';
150
+ const findings = body.findings;
151
+ if (!repository || repository !== job.repository || !originalTaskId || !reviewTaskId || !reviewExecutionId || !requestId
152
+ || !/^[a-f0-9]{40,64}$/i.test(headSha) || !Array.isArray(findings) || findings.length < 1 || findings.length > 200)
153
+ throw new Error('task.revise requires matching repository, original/reviewer IDs, active execution ID, valid SHA, stable request ID and nonempty findings');
154
+ // Trust fresh local Git truth, not the caller or PR projection. The
155
+ // atomic reducer independently checks durable head and execution.
156
+ const projectRoot = await resolveManagedProjectPath(job.repository);
157
+ const projectPath = resolveRepositoryProjectPath(projectRoot, job.projectPath);
158
+ const liveHead = job.localMerge?.sourceRef
159
+ ? localSourceHead(projectPath, job.localMerge.sourceRef)
160
+ : localWorkingHead(projectPath);
161
+ if (liveHead !== headSha)
162
+ throw new Error('task.revise rejected: local Git source head changed since immutable review');
163
+ const response = await submitTargetedRevisionRequest(store, jobId, {
164
+ requestId, reviewTaskId, reviewExecutionId, headSha, originalTaskId,
165
+ findings: findings,
166
+ });
167
+ // Reviewer is still RUNNING: verdict event will wake the reconciler.
168
+ // The committed receipt must not be obscured by an unrelated wake failure.
169
+ return response;
170
+ }
140
171
  if (command === 'task.comment') {
141
172
  const taskId = typeof body.taskId === 'string' ? body.taskId : '';
142
173
  const message = typeof body.message === 'string' ? body.message : '';