agents-relay 2.0.42 → 2.0.43

package/dist/cli-blocker.js

@@ -1,7 +1,7 @@
 import { GitHubStore } from './store.js';
 import { githubAuthContext } from './github-auth.js';
 import { registerBlockerDependency } from './blockers.js';
-import { arg, eventBus, publishDependentUnblocked, repository } from './cli-support.js';
+import { arg, publishDependentUnblocked, repository, withEventBus } from './cli-support.js';
 import { usage } from './cli-help.js';
 export async function runBlockerCommand(action, args) {
     if (!['add', 'resolve', 'show'].includes(action))
@@ -19,7 +19,7 @@ export async function runBlockerCommand(action, args) {
     }
     if (action === 'resolve') {
         const summary = await blockerStore.resolveBlockerDependents(id, 'verified');
-        await publishDependentUnblocked(await eventBus(args), summary.unblocked, `Blocker Job ${id} resolved (verified)`);
+        await withEventBus(args, bus => publishDependentUnblocked(bus, summary.unblocked, `Blocker Job ${id} resolved (verified)`));
         console.log(JSON.stringify({ blocker: id, resolution: 'verified', ...summary }, null, 2));
         return;
     }

package/dist/cli-support.js

@@ -139,6 +139,15 @@ export async function eventBus(args) {
     process.stderr.write(`${eventBusResolutionMessage(resolution)}\n`);
     return resolution.bus;
 }
+export async function withEventBus(args, work, resolve = eventBus) {
+    const bus = await resolve(args);
+    try {
+        return await work(bus);
+    }
+    finally {
+        await bus?.close?.();
+    }
+}
 export async function publishWake(bus, job, taskId, message) { if (!bus)
     return; try {
     await bus.publish(eventFor(job.id, taskId, null, 'job.wake', 'queued', message, 'orchestrator', { repository: job.repository, prNumber: job.prNumber }));

package/dist/cli-unblock.js

@@ -1,4 +1,4 @@
-import { arg, eventBus, publishTaskUnblocked, publishWake, saveLocal } from './cli-support.js';
+import { arg, publishTaskUnblocked, publishWake, saveLocal, withEventBus } from './cli-support.js';
 import { isEffectivelyBlocked, unblockAutonomousTasks, unblockTask } from './unblock.js';
 export async function runTaskUnblockCommand(args, store, job, task, localFile) {
     const reason = arg(args, '--reason');
@@ -7,9 +7,10 @@ export async function runTaskUnblockCommand(args, store, job, task, localFile) {
     const result = await unblockTask({ store, job, task, trigger: { source: 'cli', reason } });
     const refreshed = await store.load(job.id);
     await saveLocal(localFile, refreshed);
-    const bus = await eventBus(args);
-    await publishTaskUnblocked(bus, refreshed, task.id, reason);
-    await publishWake(bus, refreshed, task.id, `Task ${task.id} unblocked${result.replanning ? ' for replanning' : ''}`);
+    await withEventBus(args, async (bus) => {
+        await publishTaskUnblocked(bus, refreshed, task.id, reason);
+        await publishWake(bus, refreshed, task.id, `Task ${task.id} unblocked${result.replanning ? ' for replanning' : ''}`);
+    });
     console.log(JSON.stringify({ taskId: task.id, ...result, task: refreshed.tasks.find(item => item.id === task.id) }, null, 2));
 }
 export async function runJobUnblockCommand(args, store, job) {
@@ -22,19 +23,21 @@ export async function runJobUnblockCommand(args, store, job) {
     if (job.executionMode === 'autonomous') {
         const planTrigger = await unblockAutonomousTasks({ store, job, tasks: blocked, trigger: { source: 'cli', reason } });
         const refreshed = await store.load(job.id);
-        const bus = await eventBus(args);
-        for (const task of blocked)
-            await publishTaskUnblocked(bus, refreshed, task.id, reason);
-        await publishWake(bus, refreshed, 'job', `Job ${job.id} unblocked for replanning`);
+        await withEventBus(args, async (bus) => {
+            for (const task of blocked)
+                await publishTaskUnblocked(bus, refreshed, task.id, reason);
+            await publishWake(bus, refreshed, 'job', `Job ${job.id} unblocked for replanning`);
+        });
         console.log(JSON.stringify({ jobId: job.id, replanning: true, planTrigger }, null, 2));
         return;
     }
     for (const task of blocked)
         await unblockTask({ store, job, task, trigger: { source: 'cli', reason } });
     const refreshed = await store.load(job.id);
-    const bus = await eventBus(args);
-    for (const task of blocked)
-        await publishTaskUnblocked(bus, refreshed, task.id, reason);
-    await publishWake(bus, refreshed, 'job', `Job ${job.id} unblocked`);
+    await withEventBus(args, async (bus) => {
+        for (const task of blocked)
+            await publishTaskUnblocked(bus, refreshed, task.id, reason);
+        await publishWake(bus, refreshed, 'job', `Job ${job.id} unblocked`);
+    });
     console.log(JSON.stringify({ jobId: job.id, replanning: false, resumedTasks: blocked.map(task => task.id) }, null, 2));
 }

package/dist/cli.js

@@ -29,7 +29,7 @@ import { parseAgentGraph } from './agent-graph.js';
 import { runJobUnblockCommand, runTaskUnblockCommand } from './cli-unblock.js';
 import { createJobEntity, createTaskEntity } from './workflow/entity-creation.js';
 export { helpText } from './cli-help.js';
-import { SERVICE_DEFAULTS, ServiceEventBus, arg, hasArg, textOption, integerArg, repository, storeFor, saveLocal, githubStore, eventBus, publishWake, publishDependentUnblocked, priority, storySize, executionMode, chatGptTabClosePolicy, requestedExecutionMode, continuation, scheduleFromArgs, jobTagFromArgs, requestManagedReconciliation, relayControlJob, relayTaskCommand, } from './cli-support.js';
+import { SERVICE_DEFAULTS, ServiceEventBus, arg, hasArg, textOption, integerArg, repository, storeFor, saveLocal, githubStore, eventBus, publishWake, publishDependentUnblocked, priority, storySize, executionMode, chatGptTabClosePolicy, requestedExecutionMode, continuation, scheduleFromArgs, jobTagFromArgs, requestManagedReconciliation, relayControlJob, relayTaskCommand, withEventBus, } from './cli-support.js';
 export { SERVICE_DEFAULTS, eventBus, executionMode, chatGptTabClosePolicy } from './cli-support.js';
 export async function ensureManagedGitHubJob(client, repositoryName, trustedAuthors, options) {
     if (!options.id)
@@ -185,7 +185,7 @@ async function runTaskCommand(action, args) {
         }
         const durableTask = (await store.load(job.id)).tasks.find(item => item.id === task.id) ?? task;
         await saveLocal(localFile, await store.load(job.id));
-        await publishWake(await eventBus(args), refreshed, task.id, `Task ${task.id} created`);
+        await withEventBus(args, bus => publishWake(bus, refreshed, task.id, `Task ${task.id} created`));
         console.log(JSON.stringify(durableTask, null, 2));
         return;
     }
@@ -228,7 +228,7 @@ async function runTaskCommand(action, args) {
             outputTask = outputJob.tasks.find(item => item.id === id) ?? result.task;
         }
         await saveLocal(localFile, outputJob);
-        await publishWake(await eventBus(args), outputJob, outputTask.id, `${outputTask.id} ${action} requested`);
+        await withEventBus(args, bus => publishWake(bus, outputJob, outputTask.id, `${outputTask.id} ${action} requested`));
         console.log(JSON.stringify(outputTask, null, 2));
         return;
     }
@@ -397,7 +397,7 @@ async function runJobCommand(action, args) {
         await transitionJobEvent(job, 'pr.merged');
         await store.saveJob(job);
         const resolved = await store.resolveBlockerDependents(id, 'merge');
-        await publishDependentUnblocked(await eventBus(args), resolved.unblocked, `Blocker Job ${id} resolved (merge)`);
+        await withEventBus(args, bus => publishDependentUnblocked(bus, resolved.unblocked, `Blocker Job ${id} resolved (merge)`));
         console.log(JSON.stringify(await store.load(id), null, 2));
         return;
     }
@@ -597,7 +597,6 @@ async function main() {
         console.log(`Initialized ${job.id}`);
         return;
     }
-    const bus = await eventBus(args);
     if (command === 'status') {
         const host = arg(args, '--host', '127.0.0.1');
         const port = Number(arg(args, '--port', String(SERVICE_DEFAULTS.port)));
@@ -619,15 +618,12 @@ async function main() {
     const { store, job, localFile } = loaded;
     if (command === 'plan') {
         const guidance = hasArg(args, '--prompt') || hasArg(args, '--prompt-file') ? await textOption(args, '--prompt', '--prompt-file') : undefined;
-        try {
+        await withEventBus(args, async (bus) => {
             const result = await runtime(store, args, bus).planJob(job.id, guidance?.trim() || undefined);
             await saveLocal(localFile, result.job);
             await publishWake(bus, result.job, result.round.id, `Planning round ${result.round.id} completed`);
             console.log(JSON.stringify(result.round, null, 2));
-        }
-        finally {
-            await bus?.close?.();
-        }
+        });
         return;
     }
     if (command === 'agent-register') {
@@ -659,27 +655,24 @@ async function main() {
         console.log(`Recorded ${id}`);
         return;
     }
-    if (command === 'reconcile' && !localFile) {
-        try {
-            await requestManagedReconciliation(bus, job);
-            console.log(JSON.stringify(await store.load(job.id), null, 2));
-        }
-        finally {
-            await bus?.close?.();
-        }
+    if (command === 'serve') {
+        await startService(args);
         return;
     }
-    const reconciler = runtime(store, args, bus);
     if (command === 'reconcile') {
-        await reconciler.reconcile(job.id);
-        await reconciler.idle();
-        const finalState = await store.load(job.id);
-        await saveLocal(localFile, finalState);
-        console.log(JSON.stringify(finalState, null, 2));
-        return;
-    }
-    if (command === 'serve') {
-        await startService(args);
+        await withEventBus(args, async (bus) => {
+            if (!localFile) {
+                await requestManagedReconciliation(bus, job);
+                console.log(JSON.stringify(await store.load(job.id), null, 2));
+                return;
+            }
+            const reconciler = runtime(store, args, bus);
+            await reconciler.reconcile(job.id);
+            await reconciler.idle();
+            const finalState = await store.load(job.id);
+            await saveLocal(localFile, finalState);
+            console.log(JSON.stringify(finalState, null, 2));
+        });
         return;
     }
     throw new Error(usage);

package/package.json

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