agents-relay 1.0.26 → 1.0.28

package/dist/cli.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'node:url';
 import { randomUUID } from 'node:crypto';
 import { dashboardManagedJobs, InMemoryStore, GitHubStore, resolvePullRequest, listManagedGitHubJobs } from './store.js';
 import { githubAuthContext } from './github-auth.js';
+import { taskOverallTimeoutMs } from './types.js';
 import { Reconciler } from './reconciler.js';
 import { CodexAdapter, ChatGptAdapter } from './adapters.js';
 import { CodexThreadContinuation, CommandContinuation, WebhookContinuation } from './continuation.js';
@@ -61,7 +62,7 @@ Example:
     'job create': `Create or reuse an open PR and persist one durable job marker.
 
 Required: --repo OWNER/REPO, --id JOB_ID, and --head BRANCH.
-Common: --base BRANCH (default: main), --title TEXT, --body TEXT, --mode fixed|autonomous.
+Common: --base BRANCH (default: main), --title TEXT, --body TEXT, --mode fixed|autonomous, --no-auto-merge.
 With --start, also require --adapter codex|chatgpt, --model MODEL, --output task-pr|file,
 and --input TEXT. The initial task ID defaults to 'initial'; use --task-id to override it.
 
@@ -70,7 +71,7 @@ Example:
     'job adopt': `Adopt an existing PR as a durable job.
 
 Required: --repo OWNER/REPO, --pr NUMBER, and --id JOB_ID.
-Common: --title TEXT, --objective TEXT, --mode fixed|autonomous.
+Common: --title TEXT, --objective TEXT, --mode fixed|autonomous, --no-auto-merge.
 
 Example:
   npx agents-relay job adopt --repo OWNER/REPO --pr 12 --id job-12 --title "Objective"`,
@@ -90,7 +91,7 @@ Actions:
     'task update': `Update mutable durable task fields in place.
 
 Required: --task-id ID and the normal job storage options.
-Mutable while not RUNNING/SUCCEEDED/CANCELLED: --adapter, --priority, --input, --project, --agent, --parent, --deps, --capabilities, --timeout, --max-attempts, --provider, --model, --profile, --reasoning, --cwd, --chatgpt-project, --chatgpt-tab-close-policy.
+Mutable while not RUNNING/SUCCEEDED/CANCELLED: --adapter, --priority, --story-size, --input, --project, --agent, --parent, --deps, --capabilities, --timeout, --max-attempts, --provider, --model, --profile, --reasoning, --cwd, --chatgpt-project, --chatgpt-tab-close-policy.
 Use --clear-routing to remove routing metadata. A model update requires --model; provider defaults to the existing provider or openai.
 
 Example:
@@ -224,6 +225,8 @@ catch (error) {
 } }
 function priority(args, fallback = 'P2') { const value = arg(args, '--priority', fallback); if (!['P0', 'P1', 'P2', 'P3'].includes(value))
     throw new Error('--priority must be P0, P1, P2, or P3'); return value; }
+function storySize(args, fallback = 'M') { const value = arg(args, '--story-size', fallback).toUpperCase(); if (!['S', 'M', 'L'].includes(value))
+    throw new Error('--story-size must be S, M, or L'); return value; }
 export function executionMode(args, fallback = 'fixed') { const value = arg(args, '--mode', arg(args, '--execution-mode', fallback)); if (value !== 'fixed' && value !== 'autonomous')
     throw new Error('--mode must be fixed or autonomous'); return value; }
 export function chatGptTabClosePolicy(args) {
@@ -247,7 +250,7 @@ export async function ensureManagedGitHubJob(client, repositoryName, trustedAuth
         if (!(error instanceof Error) || !error.message.includes('has no durable'))
             throw error;
         const now = new Date().toISOString();
-        job = { id: options.id, title: options.title || pr.title || 'Agents Relay job', objective: options.objective || pr.body || undefined, description: pr.body || undefined, priority: options.priority ?? 'P2', executionMode: options.executionMode ?? 'fixed', prNumber: pr.number, repository: repositoryName, state: 'OPEN', continuation: options.continuation ?? null, createdAt: now, updatedAt: now, tasks: [] };
+        job = { id: options.id, title: options.title || pr.title || 'Agents Relay job', objective: options.objective || pr.body || undefined, description: pr.body || undefined, priority: options.priority ?? 'P2', executionMode: options.executionMode ?? 'fixed', autoMerge: options.autoMerge ?? true, prNumber: pr.number, repository: repositoryName, state: 'OPEN', continuation: options.continuation ?? null, createdAt: now, updatedAt: now, tasks: [] };
     }
     if (!job.description && pr.body)
         job.description = pr.body;
@@ -255,6 +258,8 @@ export async function ensureManagedGitHubJob(client, repositoryName, trustedAuth
         job.objective = options.objective;
     if (options.executionMode)
         job.executionMode = options.executionMode;
+    if (options.autoMerge !== undefined)
+        job.autoMerge = options.autoMerge;
     if (options.priority)
         job.priority = options.priority;
     else if (!job.priority)
@@ -283,10 +288,13 @@ function workerTaskFromArgs(job, args, now, requireInput = false) {
         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 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);
     return {
         jobId: job.id,
         id: arg(args, '--task-id', 'initial'),
         priority: priority(args, job.priority ?? 'P2'),
+        storySize: size,
         projectName: arg(args, '--project') || undefined,
         agentName: arg(args, '--agent') || undefined,
         parentTaskId: arg(args, '--parent') || null,
@@ -308,7 +316,7 @@ function workerTaskFromArgs(job, args, now, requireInput = false) {
         threadId: null,
         result: null,
         error: null,
-        timeoutMs: Number(arg(args, '--timeout', '300000')),
+        timeoutMs,
         createdAt: now,
         updatedAt: now
     };
@@ -333,6 +341,11 @@ async function runTaskCommand(action, args) {
     }
     if (hasArg(args, '--priority'))
         task.priority = priority(args, task.priority ?? job.priority ?? 'P2');
+    if (hasArg(args, '--story-size')) {
+        task.storySize = storySize(args, task.storySize ?? 'M');
+        if (!hasArg(args, '--timeout'))
+            task.timeoutMs = taskOverallTimeoutMs(task.storySize, task.routing?.reasoning);
+    }
     if (hasArg(args, '--input'))
         task.input = arg(args, '--input');
     if (hasArg(args, '--project'))
@@ -369,6 +382,8 @@ async function runTaskCommand(action, args) {
             decidedBy: 'cli:update',
             decidedAt: new Date().toISOString()
         };
+        if (hasArg(args, '--reasoning') && !hasArg(args, '--timeout'))
+            task.timeoutMs = taskOverallTimeoutMs(task.storySize ?? 'M', task.routing.reasoning);
     }
     task.updatedAt = new Date().toISOString();
     await store.saveTask(task);
@@ -405,6 +420,7 @@ async function runJobCommand(action, args) {
         objective: arg(args, '--objective') || undefined,
         priority: priority(args),
         executionMode: requestedExecutionMode(args),
+        autoMerge: !hasArg(args, '--no-auto-merge'),
         continuation: continuation(args),
         prNumber,
         head: arg(args, '--head') || undefined,
@@ -518,7 +534,7 @@ async function main() {
     }
     if (command === 'init') {
         const now = new Date().toISOString();
-        const job = { id: arg(args, '--id', randomUUID()), title: arg(args, '--title', 'Agents Relay job'), objective: arg(args, '--objective') || undefined, priority: priority(args), executionMode: executionMode(args), prNumber: Number(arg(args, '--pr', '0')), repository: arg(args, '--repo'), state: 'OPEN', continuation: continuation(args), createdAt: now, updatedAt: now, tasks: [] };
+        const job = { id: arg(args, '--id', randomUUID()), title: arg(args, '--title', 'Agents Relay job'), objective: arg(args, '--objective') || undefined, priority: priority(args), executionMode: executionMode(args), autoMerge: !hasArg(args, '--no-auto-merge'), prNumber: Number(arg(args, '--pr', '0')), repository: arg(args, '--repo'), state: 'OPEN', continuation: continuation(args), createdAt: now, updatedAt: now, tasks: [] };
         let store;
         let file = null;
         if (arg(args, '--repo') && arg(args, '--pr'))

package/dist/planner.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import { readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import { taskOverallTimeoutMs } from './types.js';
 function record(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         throw new Error('Planner result must be an object');
@@ -83,17 +84,22 @@ export function parsePlannerResult(value) {
         if (output.kind === 'file' && (typeof output.path !== 'string' || output.path.length === 0))
             throw new Error(`Planner next_tasks[${index}].output.path is required for file output`);
         const priority = task.priority === undefined ? undefined : normalizePlannerPriority(task.priority, `next_tasks[${index}].priority`);
+        const sizeValue = task.storySize === undefined ? 'M' : String(task.storySize).toUpperCase();
+        if (!['S', 'M', 'L'].includes(sizeValue))
+            throw new Error('Planner next_tasks[' + index + '].storySize must be S, M, or L');
+        const storySize = sizeValue;
         const maxAttempts = task.maxAttempts === undefined ? 3 : task.maxAttempts;
-        const timeoutMs = task.timeoutMs === undefined ? 300000 : task.timeoutMs;
+        const route = routing(task.routing, 'next_tasks[' + index + '].routing');
+        const timeoutMs = task.timeoutMs === undefined ? taskOverallTimeoutMs(storySize, route?.reasoning) : task.timeoutMs;
         if (typeof maxAttempts !== 'number' || !Number.isInteger(maxAttempts) || maxAttempts < 1)
             throw new Error(`Planner next_tasks[${index}].maxAttempts is invalid`);
         if (typeof timeoutMs !== 'number' || !Number.isFinite(timeoutMs) || timeoutMs < 0)
             throw new Error(`Planner next_tasks[${index}].timeoutMs is invalid`);
         return {
-            id, input: task.input, priority,
+            id, input: task.input, priority, storySize,
             projectName: optionalString(task.projectName, 'projectName'), agentName: optionalString(task.agentName, 'agentName'),
             dependencies: stringArray(task.dependencies, 'dependencies'), capabilities: stringArray(task.capabilities, 'capabilities'),
-            adapter: adapter, output: output, routing: routing(task.routing, `next_tasks[${index}].routing`),
+            adapter: adapter, output: output, routing: route,
             continuation: task.continuation, maxAttempts, timeoutMs
         };
     });

package/dist/reconciler.js

@@ -1,4 +1,5 @@
 import { randomUUID } from 'node:crypto';
+import { storySizeTimeoutMs, taskOverallTimeoutMs } from './types.js';
 import { schedule, transitionTask } from './scheduler.js';
 import { LaunchFailure, StartAckTimeout } from './adapters.js';
 import { eventFor } from './events.js';
@@ -203,7 +204,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, 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 and do not merge.`, 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 ?? 300000, 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}. 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';
@@ -246,6 +247,10 @@ export class Reconciler {
         }
         job.updatedAt = job.review.updatedAt;
         await this.store.saveJob(job);
+        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' }));
+        }
     }
     async recoverLostExecutions(job, now) {
         for (const task of job.tasks.filter(item => item.state === 'RUNNING')) {
@@ -297,7 +302,7 @@ export class Reconciler {
             id = `planner-${number}`;
         }
         const now = new Date().toISOString();
-        const task = { jobId: job.id, id, kind: 'planner', agentName: 'planner', parentTaskId: latest?.id ?? null, dependencies: [], capabilities: ['planner'], adapter: 'orchestrator', input: plannerInput({ job, tasks: job.tasks, objective: job.objective ?? job.description ?? job.title, previousPlannerTaskId: latest?.id ?? null }), 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: this.options.plannerTimeoutMs ?? 300000, createdAt: now, updatedAt: now };
+        const task = { jobId: job.id, id, kind: 'planner', storySize: 'M', agentName: 'planner', parentTaskId: latest?.id ?? null, dependencies: [], capabilities: ['planner'], adapter: 'orchestrator', input: plannerInput({ job, tasks: job.tasks, objective: job.objective ?? job.description ?? job.title, previousPlannerTaskId: latest?.id ?? null }), 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: this.options.plannerTimeoutMs ?? storySizeTimeoutMs('M'), createdAt: now, updatedAt: now };
         await this.store.appendTask(task);
         await this.emit(eventFor(job.id, task.id, task.parentTaskId, 'planner.created', 'queued', `Planner task ${task.id} created`, 'orchestrator'));
         return this.store.load(job.id);
@@ -492,7 +497,7 @@ export class Reconciler {
     }
     plannerChild(job, planner, spec) {
         const now = new Date().toISOString();
-        return { jobId: job.id, id: spec.id, kind: 'work', priority: spec.priority ?? job.priority, projectName: spec.projectName, agentName: spec.agentName, parentTaskId: planner.id, dependencies: spec.dependencies ?? [], capabilities: spec.capabilities ?? [], adapter: spec.adapter, input: spec.input, output: spec.output, routing: spec.routing, continuation: spec.continuation ?? null, continuationDeliveredAt: null, state: 'QUEUED', attempt: 0, maxAttempts: spec.maxAttempts ?? 3, leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null, result: null, plannerResult: null, error: null, timeoutMs: spec.timeoutMs ?? 300000, createdAt: now, updatedAt: now };
+        return { jobId: job.id, id: spec.id, kind: 'work', priority: spec.priority ?? job.priority, storySize: spec.storySize ?? 'M', projectName: spec.projectName, agentName: spec.agentName, parentTaskId: planner.id, dependencies: spec.dependencies ?? [], capabilities: spec.capabilities ?? [], adapter: spec.adapter, input: spec.input, output: spec.output, routing: spec.routing, continuation: spec.continuation ?? null, continuationDeliveredAt: null, state: 'QUEUED', 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', spec.routing?.reasoning), createdAt: now, updatedAt: now };
     }
     clearExecution(taskId, executionId) {
         const live = this.live.get(taskId);
@@ -693,5 +698,5 @@ export class Reconciler {
     } }
 }
 function samePlannerChildDefinition(left, right) {
-    return JSON.stringify({ id: left.id, input: left.input, output: left.output, priority: left.priority, projectName: left.projectName, agentName: left.agentName, dependencies: left.dependencies, capabilities: left.capabilities, adapter: left.adapter, routing: left.routing, continuation: left.continuation ?? null, maxAttempts: left.maxAttempts, timeoutMs: left.timeoutMs }) === JSON.stringify({ id: right.id, input: right.input, output: right.output, priority: right.priority, projectName: right.projectName, agentName: right.agentName, dependencies: right.dependencies, capabilities: right.capabilities, adapter: right.adapter, routing: right.routing, continuation: right.continuation ?? null, maxAttempts: right.maxAttempts, timeoutMs: right.timeoutMs });
+    return JSON.stringify({ id: left.id, input: left.input, output: left.output, priority: left.priority, storySize: left.storySize ?? 'M', projectName: left.projectName, agentName: left.agentName, dependencies: left.dependencies, capabilities: left.capabilities, adapter: left.adapter, routing: left.routing, continuation: left.continuation ?? null, maxAttempts: left.maxAttempts, timeoutMs: left.timeoutMs }) === JSON.stringify({ id: right.id, input: right.input, output: right.output, priority: right.priority, storySize: right.storySize ?? 'M', projectName: right.projectName, agentName: right.agentName, dependencies: right.dependencies, capabilities: right.capabilities, adapter: right.adapter, routing: right.routing, continuation: right.continuation ?? null, maxAttempts: right.maxAttempts, timeoutMs: right.timeoutMs });
 }

package/dist/store.js

@@ -81,7 +81,7 @@ function immutableTaskDefinition(task) {
         reasoning: task.routing.reasoning, cwd: task.routing.cwd, projectId: task.routing.projectId
     } : undefined;
     return {
-        jobId: task.jobId, id: task.id, priority: task.priority, projectName: task.projectName, agentName: task.agentName,
+        jobId: task.jobId, id: task.id, priority: task.priority, storySize: task.storySize ?? 'M', projectName: task.projectName, agentName: task.agentName,
         kind: task.kind ?? 'work', parentTaskId: task.parentTaskId, dependencies: task.dependencies, capabilities: task.capabilities, adapter: task.adapter,
         input: task.input, output: task.output, routing, chatgptTabClosePolicy: task.chatgptTabClosePolicy ?? 'after-start', continuation: task.continuation ?? null, maxAttempts: task.maxAttempts, timeoutMs: task.timeoutMs
     };
@@ -461,6 +461,17 @@ export class GitHubStore {
             return 'MERGED';
         return String(pr.state ?? '').toUpperCase() === 'CLOSED' ? 'CLOSED' : 'OPEN';
     }
+    async mergePullRequest(expectedHeadSha) {
+        const payload = { merge_method: 'squash' };
+        if (expectedHeadSha)
+            payload.sha = expectedHeadSha;
+        const result = await this.client.request('repos/' + this.repository + '/pulls/' + this.prNumber + '/merge', {
+            method: 'PUT',
+            body: JSON.stringify(payload),
+        });
+        if (result.merged !== true)
+            throw new Error(typeof result.message === 'string' ? result.message : 'Pull request #' + this.prNumber + ' was not merged');
+    }
     async headSha() {
         const { owner, name } = this.repoParts();
         const data = await this.graphql('query($owner:String!,$name:String!,$number:Int!){repository(owner:$owner,name:$name){pullRequest(number:$number){headRefOid}}}', { owner, name, number: this.prNumber });

package/dist/types.js

@@ -1,3 +1,6 @@
+export const STORY_SIZE_TIMEOUT_MS = { S: 120000, M: 300000, L: 900000 };
+export function storySizeTimeoutMs(size) { return STORY_SIZE_TIMEOUT_MS[size]; }
+export function taskOverallTimeoutMs(size, reasoning) { return storySizeTimeoutMs(size) * (reasoning?.toLowerCase() === 'high' ? 2 : 1); }
 const jobTransitions = { OPEN: ['RUNNING', 'WAITING', 'BLOCKED', 'COMPLETED', 'CANCELLED'], RUNNING: ['OPEN', 'WAITING', 'BLOCKED', 'COMPLETED', 'FAILED', 'CANCELLED'], WAITING: ['RUNNING', 'BLOCKED', 'COMPLETED', 'CANCELLED'], BLOCKED: ['RUNNING', 'CANCELLED'], COMPLETED: ['RUNNING', 'CANCELLED'], FAILED: ['RUNNING', 'CANCELLED'], CANCELLED: ['RUNNING'] };
 const taskTransitions = { QUEUED: ['READY', 'BLOCKED', 'CANCELLED'], READY: ['RUNNING', 'BLOCKED', 'FAILED', 'CANCELLED'], RUNNING: ['WAITING', 'BLOCKED', 'SUCCEEDED', 'FAILED', 'CANCELLED', 'READY'], WAITING: ['READY', 'BLOCKED', 'CANCELLED'], BLOCKED: ['READY', 'CANCELLED'], SUCCEEDED: [], FAILED: ['READY', 'CANCELLED'], CANCELLED: [] };
 export function assertJobTransition(from, to) { if (from !== to && !jobTransitions[from].includes(to))

package/package.json

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