agents-relay 1.0.34 → 1.0.36

package/dist/cli.js

@@ -117,7 +117,7 @@ Example:
     submit: `Queue a task for a managed job.
 
 Required: --repo OWNER/REPO, --pr NUMBER, --id JOB_ID, and --input TEXT.
-Required for worker tasks: --adapter codex|chatgpt, --model MODEL, and --output task-pr|file. File output also requires --output-path PATH.\nCommon: --task-id ID, --priority P0|P1|P2|P3, --story-size S|M|L, --max-attempts N. Story size defaults to M. Task producers follow the shared Task / Job Contract; prefer --story-size over raw --timeout. Model-backed execution requires --events nats in the running reconciler/daemon.
+Required for worker tasks: --adapter codex|chatgpt|orchestrator and --output task-pr|file. Codex/ChatGPT also require --model MODEL. File output also requires --output-path PATH.\nCommon: --task-id ID, --priority P0|P1|P2|P3, --story-size S|M|L, --max-attempts N. Story size defaults to M. Task producers follow the shared Task / Job Contract; prefer --story-size over raw --timeout. Model-backed execution requires --events nats in the running reconciler/daemon.
 
 Example:
   npx agents-relay submit --repo OWNER/REPO --pr 12 --id job-1 --task-id build --adapter codex --provider openai --model gpt-5-6 --output task-pr --input "Run the required tests and report the result through events."`,
@@ -329,9 +329,9 @@ function workerTaskFromArgs(job, args, now, requireInput = false) {
     const outputKind = arg(args, '--output');
     const outputPath = arg(args, '--output-path');
     const input = arg(args, '--input');
-    if (!['codex', 'chatgpt'].includes(adapter))
-        throw new Error('submit adapter must be codex or chatgpt');
-    if (!model)
+    if (!['codex', 'chatgpt', 'orchestrator'].includes(adapter))
+        throw new Error('submit adapter must be codex, chatgpt, or orchestrator');
+    if (adapter !== 'orchestrator' && !model)
         throw new Error('submit requires --model for codex/chatgpt tasks');
     if (requireInput && !input)
         throw new Error('job create --start requires --input');
@@ -339,10 +339,10 @@ function workerTaskFromArgs(job, args, now, requireInput = false) {
         throw new Error('submit requires --output task-pr|file');
     if (outputKind === 'file' && !outputPath)
         throw new Error('--output file requires --output-path');
-    const routing = { provider: arg(args, '--provider', 'openai'), model, profile: arg(args, '--profile') || undefined, reasoning: arg(args, '--reasoning') || undefined, cwd: arg(args, '--cwd') || undefined, projectId: arg(args, '--chatgpt-project') || undefined, decidedBy: 'cli', decidedAt: now };
+    const routing = adapter === 'orchestrator' ? undefined : { provider: arg(args, '--provider', 'openai'), model, profile: arg(args, '--profile') || undefined, reasoning: arg(args, '--reasoning') || undefined, cwd: arg(args, '--cwd') || undefined, projectId: arg(args, '--chatgpt-project') || undefined, decidedBy: 'cli', decidedAt: now };
     const closePolicy = hasArg(args, '--chatgpt-tab-close-policy') ? chatGptTabClosePolicy(args) : undefined;
     const size = storySize(args);
-    const timeoutMs = hasArg(args, '--timeout') ? integerArg(args, '--timeout', taskOverallTimeoutMs(size, routing.reasoning)) : taskOverallTimeoutMs(size, routing.reasoning);
+    const timeoutMs = adapter === 'orchestrator' ? 0 : hasArg(args, '--timeout') ? integerArg(args, '--timeout', taskOverallTimeoutMs(size, routing?.reasoning)) : taskOverallTimeoutMs(size, routing?.reasoning);
     return {
         jobId: job.id,
         id: arg(args, '--task-id', 'initial'),

package/dist/reconciler.js

@@ -160,6 +160,14 @@ export class Reconciler {
                 for (const task of scheduled.tasks.filter(t => t.state === 'READY').sort((a, b) => compareTaskPriority(a, b, scheduled.priority ?? 'P2')).slice(0, capacity)) {
                     if (task.kind === 'planner')
                         await this.launchPlanner(scheduled, task);
+                    else if (task.adapter === 'orchestrator') {
+                        transitionTask(task, 'RUNNING');
+                        task.leaseOwner = null;
+                        task.leaseExpiresAt = null;
+                        task.executionId = null;
+                        await this.store.saveTask(task);
+                        await this.emit(eventFor(scheduled.id, task.id, task.parentTaskId, 'task.orchestrator_assigned', 'running', `Task ${task.id} assigned to orchestrator self`, 'orchestrator', { adapter: 'orchestrator' }, { agent: 'relay', component: 'agents-relay' }));
+                    }
                     else
                         await this.launch(scheduled, task);
                 }
@@ -213,7 +221,7 @@ export class Reconciler {
             return;
         const id = `final-review-${headSha.slice(0, 12)}`;
         const now = new Date().toISOString();
-        const task = { jobId: job.id, id, kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title, agentName: 'reviewer', parentTaskId: null, dependencies: job.tasks.filter(item => item.agentName !== 'reviewer' && !this.isSupersededTask(item)).map(item => item.id), capabilities: ['review'], adapter: this.options.reviewer?.adapter ?? 'codex', input: `Review PR #${job.prNumber} at head SHA ${headSha}. Objective: ${job.objective ?? job.description ?? job.title}. First publish task.started as the worker start acknowledgement with data.worker_owned=true, then verify the deterministic pre-review gates have passed and inspect the completed work. Emit review.started, then exactly one of review.approved, review.changes_required, or review.blocked with data.review.headSha set to ${headSha}. Do not modify code. When auto-merge is enabled, Relay will merge this exact reviewed head after review.approved.`, output: { kind: 'task_pr' }, routing: this.options.reviewer?.routing, continuation: null, continuationDeliveredAt: null, reviewHeadSha: headSha, state: 'QUEUED', attempt: 0, maxAttempts: this.options.reviewer?.maxAttempts ?? 2, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: this.options.reviewer?.timeoutMs ?? storySizeTimeoutMs('M'), createdAt: now, updatedAt: now };
+        const task = { jobId: job.id, id, kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title, agentName: 'reviewer', parentTaskId: null, dependencies: job.tasks.filter(item => item.agentName !== 'reviewer' && !this.isSupersededTask(item)).map(item => item.id), capabilities: ['review'], adapter: this.options.reviewer?.adapter ?? 'codex', input: `Review PR #${job.prNumber} at head SHA ${headSha}. Objective: ${job.objective ?? job.description ?? job.title}. First publish task.started as the worker start acknowledgement with data.worker_owned=true, then verify the deterministic pre-review gates have passed and inspect the completed work. Emit review.started, then exactly one of review.approved, review.changes_required, or review.blocked with data.review.headSha set to ${headSha}. For review.changes_required, include every actionable finding in data.review.issues as an array of concise issue strings; Relay will create one durable fix task containing all findings. Do not modify code. When auto-merge is enabled, Relay will merge this exact reviewed head after review.approved.`, output: { kind: 'task_pr' }, routing: this.options.reviewer?.routing, continuation: null, continuationDeliveredAt: null, reviewHeadSha: headSha, state: 'QUEUED', attempt: 0, maxAttempts: this.options.reviewer?.maxAttempts ?? 2, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: this.options.reviewer?.timeoutMs ?? storySizeTimeoutMs('M'), createdAt: now, updatedAt: now };
         await this.store.appendTask(task);
         job.review = { outcome: 'pending', headSha, taskId: id, evidence: null, updatedAt: now };
         job.state = 'RUNNING';
@@ -254,8 +262,42 @@ export class Reconciler {
             task.updatedAt = job.review.updatedAt;
             await this.store.saveTask(task);
         }
+        if (outcome === 'changes_required') {
+            const rawIssues = Array.isArray(reviewData?.issues) ? reviewData.issues : [];
+            const issues = rawIssues.map(item => {
+                if (typeof item === 'string')
+                    return item.trim();
+                if (item && typeof item === 'object') {
+                    const value = item;
+                    const summary = typeof value.summary === 'string' ? value.summary : typeof value.message === 'string' ? value.message : typeof value.title === 'string' ? value.title : '';
+                    return summary.trim();
+                }
+                return '';
+            }).filter(Boolean);
+            if (issues.length === 0)
+                issues.push(event.message || 'Address the reviewer-requested changes');
+            const now = event.timestamp || new Date().toISOString();
+            const id = `review-fix-${headSha.slice(0, 8)}`;
+            if (!job.tasks.some(item => item.id === id)) {
+                const input = `Address all reviewer findings for PR #${job.prNumber} at ${headSha}:\n\n${issues.map((issue, index) => `${index + 1}. ${issue}`).join('\n')}`;
+                const fixTask = {
+                    jobId: job.id, id, kind: 'work', priority: job.priority, storySize: 'M', projectName: job.title,
+                    agentName: 'review-fix', parentTaskId: task.id, dependencies: [task.id], capabilities: ['implementation'],
+                    adapter: 'codex', input, output: { kind: 'task_pr' },
+                    routing: { provider: 'openai', model: 'gpt-5.6-luna', reasoning: 'medium', decidedBy: 'review-fix', decidedAt: now },
+                    continuation: null, continuationDeliveredAt: null, state: 'QUEUED', attempt: 0, maxAttempts: 3,
+                    leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null,
+                    error: null, timeoutMs: storySizeTimeoutMs('M'), createdAt: now, updatedAt: now
+                };
+                await this.store.appendTask(fixTask);
+                await this.emit(eventFor(job.id, id, task.id, 'review.fix_task_created', 'queued', `Created one fix task ${id} for ${issues.length} reviewer finding(s)`, 'orchestrator', { headSha, issues }, { agent: 'relay', component: 'agents-relay' }));
+            }
+            job.state = 'RUNNING';
+        }
         job.updatedAt = job.review.updatedAt;
         await this.store.saveJob(job);
+        if (outcome === 'changes_required')
+            this.detach(this.reconcile(job.id), job.id, task.id, 'review-fix reconciliation');
         if (outcome === 'approved' && job.autoMerge !== false && this.store.mergePullRequest) {
             await this.store.mergePullRequest(headSha);
             await this.emit(eventFor(job.id, task.id, task.parentTaskId, 'review.merged', 'succeeded', 'Reviewer-approved PR #' + job.prNumber + ' merged', 'user', { headSha, autoMerge: true }, { agent: 'reviewer', component: 'agents-relay' }));
@@ -675,7 +717,7 @@ export class Reconciler {
     async applyTerminalEvent(event) {
         const job = await this.store.load(event.job_id);
         const task = job.tasks.find(item => item.id === event.task_id);
-        if (!task || !['codex', 'chatgpt'].includes(task.adapter))
+        if (!task || !['codex', 'chatgpt', 'orchestrator'].includes(task.adapter))
             return;
         if (task.state === 'FAILED' && this.isRecoverableWatchdogFailure(task) && this.isWorkerOwnedEvent(event)) {
             if (event.timestamp && new Date(event.timestamp).getTime() < new Date(task.updatedAt).getTime())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agents-relay",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Durable async agent jobs coordinated through GitHub pull requests",
   "type": "module",
   "bin": {