agent-relay-server 0.10.26 → 0.10.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.10.26",
+  "version": "0.10.27",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",

package/src/db.ts

@@ -2173,6 +2173,34 @@ export function reapStaleAgents(ttlMs: number = STALE_TTL_MS): string[] {
   return rows.map((r: any) => r.id);
 }
 
+// On-demand automation tasks (targetMode=on_demand_agent) are bound to a single
+// ephemeral agent spawned just for that task. When that agent's claim is released —
+// clean shutdown, prune, lease expiry, or orphan-grace — the task must NOT return to
+// the claimable pool: its target is a unique `label:automation-…` that no other agent
+// will ever match, so a re-opened task lingers forever as an orphaned claim. Resolve
+// those as done instead; automation reconcile then settles the run as succeeded.
+// Run this BEFORE the generic re-open UPDATE at each release site, with the same WHERE
+// condition: it flips matching single-target tasks to 'done', which the subsequent
+// re-open (gated on status IN claimed/in_progress/blocked/orphaned) then skips.
+function settleSingleTargetOnDemandTasks(condition: string, params: any[], now: number, reason: string): void {
+  const selectSql = `${TASK_SELECT} WHERE (${condition}) AND json_extract(metadata, '$.targetMode') = 'on_demand_agent' AND status IN ('claimed', 'in_progress', 'blocked', 'orphaned')`;
+  const rows = db.prepare(selectSql).all(...params) as any[];
+  if (rows.length === 0) return;
+  db.prepare(
+    `UPDATE tasks SET status = 'done', claim_expires_at = NULL, updated_at = ?, last_seen_at = ? WHERE (${condition}) AND json_extract(metadata, '$.targetMode') = 'on_demand_agent' AND status IN ('claimed', 'in_progress', 'blocked', 'orphaned')`
+  ).run(now, now, ...params);
+  for (const row of rows) {
+    insertTaskEvent(row.id, {
+      source: "agent-relay",
+      type: "task.auto-completed",
+      severity: row.severity,
+      title: "On-demand task auto-resolved",
+      body: `On-demand agent ${row.claimed_by ?? "(unknown)"} exited (${reason}); task resolved so it does not orphan`,
+      metadata: { agentId: row.claimed_by, reason, completedBy: "relay" },
+    }, now);
+  }
+}
+
 export function pruneOfflineAgents(maxOfflineMs: number = DAY_MS): string[] {
   const cutoff = Date.now() - maxOfflineMs;
   return db.transaction(() => {
@@ -2191,9 +2219,12 @@ export function pruneOfflineAgents(maxOfflineMs: number = DAY_MS): string[] {
       )
       .run(cutoff);
 
+    const offlineClaimCondition = "claimed_by IN (SELECT id FROM agents WHERE status = 'offline' AND last_seen < ? AND id NOT IN ('user', 'system'))";
+    settleSingleTargetOnDemandTasks(offlineClaimCondition, [cutoff], now, "agent-pruned");
+
     db
       .prepare(
-        "UPDATE tasks SET status = 'open', claimed_by = NULL, claimed_at = NULL, claim_expires_at = NULL, updated_at = ? WHERE claimed_by IN (SELECT id FROM agents WHERE status = 'offline' AND last_seen < ? AND id NOT IN ('user', 'system')) AND status IN ('claimed', 'in_progress', 'blocked')"
+        `UPDATE tasks SET status = 'open', claimed_by = NULL, claimed_at = NULL, claim_expires_at = NULL, updated_at = ? WHERE ${offlineClaimCondition} AND status IN ('claimed', 'in_progress', 'blocked')`
       )
       .run(now, cutoff);
 
@@ -2232,6 +2263,7 @@ export function deleteAgent(id: string): { ok: boolean; error?: string } {
     // from_agent is left intact as historical record.
     const now = Date.now();
     db.prepare("UPDATE messages SET claimed_by = NULL, claimed_at = NULL, claim_expires_at = NULL WHERE claimed_by = ?").run(id);
+    settleSingleTargetOnDemandTasks("claimed_by = ?", [id], now, "agent-removed");
     db.prepare("UPDATE tasks SET status = 'open', claimed_by = NULL, claimed_at = NULL, claim_expires_at = NULL, updated_at = ? WHERE claimed_by = ? AND status IN ('claimed', 'in_progress', 'blocked')").run(now, id);
     revokeRuntimeTokensForAgent(id, now);
     closeOpenPairsForAgent(id, now);
@@ -2615,6 +2647,7 @@ export function recordTaskEvent(taskId: number, input: {
 
 export function releaseExpiredClaims(now: number = Date.now()): { messageIds: number[]; tasks: Task[] } {
   return db.transaction(() => {
+    settleSingleTargetOnDemandTasks("claimed_by IS NOT NULL AND (claim_expires_at IS NULL OR claim_expires_at <= ?)", [now], now, "claim-lease-expired");
     const releasableMessageClaim = "claimed_by IS NOT NULL AND (claim_expires_at IS NULL OR claim_expires_at <= ?) AND NOT EXISTS (SELECT 1 FROM tasks t WHERE t.message_id = messages.id AND t.status IN ('done', 'failed', 'canceled'))";
     const messageRows = db
       .prepare(`SELECT id FROM messages WHERE ${releasableMessageClaim}`)
@@ -2684,6 +2717,7 @@ export function orphanTasksForAgent(agentId: string, now: number = Date.now()):
 export function releaseOrphanedTasks(graceMs = 120_000, now: number = Date.now()): Task[] {
   return db.transaction(() => {
     const cutoff = now - graceMs;
+    settleSingleTargetOnDemandTasks("status = 'orphaned' AND claimed_by IS NOT NULL AND updated_at <= ?", [cutoff], now, "orphan-grace-elapsed");
     const rows = db
       .prepare(`${TASK_SELECT} WHERE status = 'orphaned' AND claimed_by IS NOT NULL AND updated_at <= ?`)
       .all(cutoff) as any[];