agents-relay 1.0.25 → 1.0.27

package/dist/cli.js

@@ -61,7 +61,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 +70,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"`,
@@ -247,7 +247,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 +255,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)
@@ -405,6 +407,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 +521,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/reconciler.js

@@ -203,7 +203,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, 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 ?? 300000, createdAt: now, updatedAt: now };
         await this.store.appendTask(task);
         job.review = { outcome: 'pending', headSha, taskId: id, evidence: null, updatedAt: now };
         job.state = 'RUNNING';
@@ -235,8 +235,21 @@ export class Reconciler {
             return;
         const evidence = { summary: event.message || `Review ${outcome}`, data: { ...(event.data ?? {}), review: reviewData ?? { headSha }, headSha, outcome } };
         job.review = { outcome, headSha, taskId: task.id, evidence, updatedAt: event.timestamp || new Date().toISOString() };
+        if (outcome !== 'started') {
+            task.state = 'SUCCEEDED';
+            task.result = evidence;
+            task.error = null;
+            task.leaseOwner = null;
+            task.leaseExpiresAt = null;
+            task.updatedAt = job.review.updatedAt;
+            await this.store.saveTask(task);
+        }
         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')) {

package/dist/store.js

@@ -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/package.json

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