agent-relay-server 0.120.2 → 0.120.3

package/public/index.html

@@ -12,34 +12,34 @@
   <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' rx='6' fill='%2309090b'/%3E%3Ccircle cx='16' cy='16' r='4.5' fill='%2358a6ff'/%3E%3Ccircle cx='6' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='6' cy='24' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='24' r='2.5' fill='%233fb950'/%3E%3Cline x1='8' y1='9.5' x2='13' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='9.5' x2='19' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='8' y1='22.5' x2='13' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='22.5' x2='19' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3C/svg%3E">
   <link rel="manifest" href="manifest.webmanifest">
   <link rel="apple-touch-icon" href="icons/agent-relay-192.png">
-  <script type="module" crossorigin src="./assets/index-DfPouNiV.js"></script>
+  <script type="module" crossorigin src="./assets/index-Ceiwd02X.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/chunk-CilyBKbf.js">
   <link rel="modulepreload" crossorigin href="./assets/preload-helper-C_JMBXql.js">
-  <link rel="modulepreload" crossorigin href="./assets/lucide-react-Dc3ZwCBi.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-ChDX_t12.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-Cs8X0P1d.js">
-  <link rel="modulepreload" crossorigin href="./assets/react-dom-cLkVFBsS.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CQ0Z-TDi.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-mm7c7nBt.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CDZZxxJq.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-DV83j9tm.js">
+  <link rel="modulepreload" crossorigin href="./assets/lucide-react-DuhlF2Sj.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-B-T7lg0a.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BIjlN-xB.js">
+  <link rel="modulepreload" crossorigin href="./assets/react-dom-DWBmcawP.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-B9G83DXv.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-DT-OV6sQ.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-C7aTlosb.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-B3e4B9pg.js">
   <link rel="modulepreload" crossorigin href="./assets/dist-BiLuYU6G.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-DyNJNwpi.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-D2jvo5oA.js">
-  <link rel="modulepreload" crossorigin href="./assets/es2015-VnZ2kVIz.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CmFeEXMe.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-CBMWGhWc.js">
-  <link rel="modulepreload" crossorigin href="./assets/dist-y03IwOrd.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BInckSJC.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-DGfp5dLz.js">
+  <link rel="modulepreload" crossorigin href="./assets/es2015-CnKXYKpf.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-BlzVGRhh.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-OUPTEP6q.js">
+  <link rel="modulepreload" crossorigin href="./assets/dist-B6woQ9Tb.js">
   <link rel="modulepreload" crossorigin href="./assets/types-uVOXgvMT.js">
   <link rel="modulepreload" crossorigin href="./assets/display-exQDWum3.js">
-  <link rel="modulepreload" crossorigin href="./assets/store-BaslPLIP.js">
-  <link rel="modulepreload" crossorigin href="./assets/agent-type-icon-BEz393ra.js">
-  <link rel="modulepreload" crossorigin href="./assets/button-C-V4oij1.js">
-  <link rel="modulepreload" crossorigin href="./assets/copy-button-BStzXgtd.js">
-  <link rel="modulepreload" crossorigin href="./assets/formatted-body-C1AprxyU.js">
-  <link rel="modulepreload" crossorigin href="./assets/task-chip-kxk4eNm1.js">
-  <link rel="modulepreload" crossorigin href="./assets/badge-BhUZ1cAb.js">
-  <link rel="modulepreload" crossorigin href="./assets/input-CtLT7WXi.js">
+  <link rel="modulepreload" crossorigin href="./assets/store-BM4zM89B.js">
+  <link rel="modulepreload" crossorigin href="./assets/agent-type-icon-CeEoMouY.js">
+  <link rel="modulepreload" crossorigin href="./assets/button-CzdTkRIf.js">
+  <link rel="modulepreload" crossorigin href="./assets/copy-button-B3o1jpLu.js">
+  <link rel="modulepreload" crossorigin href="./assets/formatted-body-q_qzt1L-.js">
+  <link rel="modulepreload" crossorigin href="./assets/task-chip-DXfvXBDx.js">
+  <link rel="modulepreload" crossorigin href="./assets/badge-DCIT3Irj.js">
+  <link rel="modulepreload" crossorigin href="./assets/input-B6Q0NWCS.js">
   <link rel="modulepreload" crossorigin href="./assets/themes-DjSwmAZN.js">
   <link rel="stylesheet" crossorigin href="./assets/index-DcmG5gLR.css">
 </head>

package/runner/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.120.2",
+  "version": "0.120.3",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/branch-landed.ts

@@ -8,6 +8,7 @@ import { resolveCoordinatorAgentId } from "./steward-identity";
 import { stewardFallbackTarget } from "./config";
 import { handleLandedIssueLifecycle } from "./services/issue-lifecycle";
 import { handleLandedTaskLifecycle } from "./services/task-lifecycle";
+import { runGit } from "./services/git-process";
 import type { WorkspaceMergePreview, WorkspaceRecord } from "./types";
 
 // #444 — branch.landed is the first rule-driven type: the on-main "merged" fan-out audience comes
@@ -67,14 +68,9 @@ async function landedCommitSubjects(input: BranchLandedInput, log: BranchLandedL
   const tipSha = cleanRef(input.mergedSha);
   if (!repoRoot || !baseSha || !tipSha || baseSha === tipSha) return undefined;
   try {
-    const proc = Bun.spawn(["git", "-C", repoRoot, "log", "--format=%B%x00", `${baseSha}..${tipSha}`], {
-      stdin: "ignore",
-      stdout: "pipe",
-      stderr: "pipe",
-    });
-    const [stdout, stderr, exitCode] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited]);
+    const { stdout, stderr, exitCode, timedOut } = await runGit(["-C", repoRoot, "log", "--format=%B%x00", `${baseSha}..${tipSha}`]);
     if (exitCode !== 0) {
-      const error = stderr.trim() || `exit ${exitCode}`;
+      const error = timedOut ? "timed out" : stderr.trim() || `exit ${exitCode}`;
       log(`issue lifecycle commit range scan failed for ${input.workspace.id} (${baseSha.slice(0, 12)}..${tipSha.slice(0, 12)}): ${error}; falling back to tip subject`);
       return undefined;
     }

package/src/bus.ts

@@ -528,6 +528,7 @@ function fanoutAgent(agentId: string, cache: Map<string, AgentCard | null>): Age
 
 function connectionWantsEvent(conn: BusConnection, event: RelayEvent, agentCache: Map<string, AgentCard | null>): boolean {
   if (!matchesSubscription(conn.subscriptions, event.type)) return false;
+  if (event.type === "agent.status" && conn.agentId) return event.subject === conn.agentId || (typeof event.data.id === "string" && event.data.id === conn.agentId);
   if (event.type === "message.new" && conn.agentId) {
     return messageMatchesAgent(event.data as unknown as Message, conn.agentId, fanoutAgent(conn.agentId, agentCache));
   }
@@ -538,8 +539,7 @@ function connectionWantsEvent(conn: BusConnection, event: RelayEvent, agentCache
   if (event.type.startsWith("command.")) {
     const command = isRecord(event.data.command) ? event.data.command : undefined;
     if (!command) return true;
-    const target = typeof command.target === "string" ? command.target : "";
-    const source = typeof command.source === "string" ? command.source : "";
+    const target = typeof command.target === "string" ? command.target : "", source = typeof command.source === "string" ? command.source : "";
     return target === conn.componentId || target === conn.agentId || source === conn.componentId || source === conn.agentId;
   }
   return true;

package/src/db/connection.ts

@@ -74,24 +74,48 @@ export function runDbMaintenance(options: { vacuum?: boolean } = {}): {
   return { analyzed: true, checkpointed: true, vacuumed };
 }
 
-export async function runDbMaintenanceAsync(options: { vacuum?: boolean } = {}): Promise<{
+export async function runDbMaintenanceWorker<T>(operation: string, args: string[], signal?: AbortSignal): Promise<T> {
+  if (!dbPath || dbPath === ":memory:") {
+    throw new Error("database worker requires a file-backed database");
+  }
+  if (signal?.aborted) throw new Error("database worker aborted");
+  const proc = Bun.spawn([process.execPath, join(import.meta.dir, "maintenance-worker.ts"), operation, dbPath, ...args], {
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+  let killTimer: Timer | undefined;
+  const abort = () => {
+    proc.kill("SIGTERM");
+    killTimer = setTimeout(() => proc.kill("SIGKILL"), 2_000);
+  };
+  signal?.addEventListener("abort", abort, { once: true });
+  try {
+    const [stdout, stderr, exitCode] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited]);
+    if (signal?.aborted) throw new Error("database worker aborted");
+    if (exitCode !== 0) {
+      const detail = stderr.trim() || stdout.trim() || `exit ${exitCode}`;
+      throw new Error(`database worker ${operation} failed: ${detail}`);
+    }
+    return JSON.parse(stdout) as T;
+  } finally {
+    signal?.removeEventListener("abort", abort);
+    if (killTimer) clearTimeout(killTimer);
+  }
+}
+
+export async function runDbMaintenanceAsync(options: { vacuum?: boolean; signal?: AbortSignal } = {}): Promise<{
   analyzed: boolean;
   checkpointed: boolean;
   vacuumed: boolean;
   offThread: boolean;
 }> {
   if (!dbPath || dbPath === ":memory:") return { ...runDbMaintenance(options), offThread: false };
-  const proc = Bun.spawn([process.execPath, join(import.meta.dir, "maintenance-worker.ts"), dbPath, options.vacuum ? "vacuum" : "no-vacuum"], {
-    stdin: "ignore",
-    stdout: "pipe",
-    stderr: "pipe",
-  });
-  const [stdout, stderr, exitCode] = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited]);
-  if (exitCode !== 0) {
-    const detail = stderr.trim() || stdout.trim() || `exit ${exitCode}`;
-    throw new Error(`db maintenance worker failed: ${detail}`);
-  }
-  const result = JSON.parse(stdout) as { analyzed: boolean; checkpointed: boolean; vacuumed: boolean };
+  const result = await runDbMaintenanceWorker<{ analyzed: boolean; checkpointed: boolean; vacuumed: boolean }>(
+    "db-maintenance",
+    [options.vacuum ? "vacuum" : "no-vacuum"],
+    options.signal,
+  );
   return { ...result, offThread: true };
 }
 

package/src/db/maintenance-worker.ts

@@ -1,25 +1,37 @@
 import { Database } from "bun:sqlite";
 import { applyConnectionPragmas } from "./connection";
 
-const [, , dbPath, mode] = Bun.argv;
+const [, , operation, dbPath, arg] = Bun.argv;
 
-if (!dbPath) {
-  console.error("db path is required");
+if (!operation || !dbPath) {
+  console.error("operation and db path are required");
   process.exit(2);
 }
 
 const db = new Database(dbPath, { create: true });
 try {
   applyConnectionPragmas(db);
-  db.run("ANALYZE");
-  db.run("PRAGMA optimize");
-  db.run("PRAGMA wal_checkpoint(TRUNCATE)");
-  let vacuumed = false;
-  if (mode === "vacuum") {
-    db.run("VACUUM");
-    vacuumed = true;
+  if (operation === "db-maintenance") {
+    db.run("ANALYZE");
+    db.run("PRAGMA optimize");
+    db.run("PRAGMA wal_checkpoint(TRUNCATE)");
+    let vacuumed = false;
+    if (arg === "vacuum") {
+      db.run("VACUUM");
+      vacuumed = true;
+    }
+    console.log(JSON.stringify({ analyzed: true, checkpointed: true, vacuumed }));
+  } else if (operation === "old-message-prune") {
+    const cutoff = Number(arg);
+    if (!Number.isFinite(cutoff)) throw new Error("old-message-prune requires a cutoff timestamp");
+    const prunedMessages = db.transaction(() => {
+      db.query("UPDATE messages SET reply_to = NULL WHERE reply_to IN (SELECT id FROM messages WHERE created_at < ?)").run(cutoff);
+      return db.query("DELETE FROM messages WHERE created_at < ?").run(cutoff).changes;
+    })();
+    console.log(JSON.stringify({ prunedMessages }));
+  } else {
+    throw new Error(`unknown maintenance operation: ${operation}`);
   }
-  console.log(JSON.stringify({ analyzed: true, checkpointed: true, vacuumed }));
 } finally {
   db.close();
 }

package/src/db/message-reads.ts

@@ -17,7 +17,7 @@ import { matchAgents } from "../agent-ref";
 import { getAgent } from "./agents.ts";
 import { sendMessageWithResult } from "./messages.ts";
 import { deleteArtifactLinksForEntity } from "./artifacts.ts";
-import { getDb, timedQuery } from "./connection.ts";
+import { getDb, getDbPath, runDbMaintenanceWorker, timedQuery } from "./connection.ts";
 import { legacyChannelTargets, isChannelAgentId } from "./delivery.ts";
 import { messageTaskClosed } from "./claim-sql.ts";
 import { MSG_SELECT, rowToMessage } from "./mappers.ts";
@@ -630,6 +630,10 @@ export function getLatestMessageId(): number {
 
 export function pruneOldMessages(maxAgeMs: number): number {
   const cutoff = Date.now() - maxAgeMs;
+  return pruneOldMessagesBefore(cutoff);
+}
+
+function pruneOldMessagesBefore(cutoff: number): number {
   return getDb().transaction(() => {
     getDb()
       .query("UPDATE messages SET reply_to = NULL WHERE reply_to IN (SELECT id FROM messages WHERE created_at < ?)")
@@ -639,3 +643,15 @@ export function pruneOldMessages(maxAgeMs: number): number {
       .run(cutoff).changes;
   })();
 }
+
+export async function pruneOldMessagesAsync(maxAgeMs: number, options: { signal?: AbortSignal } = {}): Promise<{
+  prunedMessages: number;
+  offThread: boolean;
+}> {
+  const cutoff = Date.now() - maxAgeMs;
+  if (!getDbPath() || getDbPath() === ":memory:") {
+    return { prunedMessages: pruneOldMessagesBefore(cutoff), offThread: false };
+  }
+  const result = await runDbMaintenanceWorker<{ prunedMessages: number }>("old-message-prune", [String(cutoff)], options.signal);
+  return { ...result, offThread: true };
+}

package/src/maintenance/jobs.ts

@@ -13,7 +13,7 @@ import {
   listStaleQueuedDirectTargets,
   pruneOrphanedSharedWorkspaces,
   pruneOfflineAgents,
-  pruneOldMessages,
+  pruneOldMessagesAsync,
   pruneProviderQuotaHistory,
   reapStaleAgents,
   reapStaleOrchestrators,
@@ -72,6 +72,10 @@ import type { MaintenanceJobDefinition } from "./types";
 
 let dbMaintenanceRuns = 0;
 
+function isFleetIdleForVacuum(): boolean {
+  return !listAgents({ status: "busy" }).some((agent) => agent.kind === "provider" && agent.id !== "user" && agent.id !== "system");
+}
+
 function isManagedBusyWatchCandidate(agent: ReturnType<typeof listAgents>[number]): boolean {
   if (agent.kind !== "provider") return false;
   if (agent.status !== "busy") return false;
@@ -315,17 +319,17 @@ export const definitions: MaintenanceJobDefinition[] = [
     description: "Stop spawned sessions whose relay agent is offline/gone but whose process the orchestrator still reports running, after a grace period for self-heal.",
     intervalMs: ORPHAN_REAPER_INTERVAL_MS,
     runOnStart: false,
-    handler: reapOrphanedSessions,
+    handler: () => reapOrphanedSessions(),
   },
-  { id: "transient-agent-reaper", title: "Transient agent reaper", description: "Cleanly shut down transient spawned agents once they are idle and any isolated branch work has landed.", intervalMs: REAP_INTERVAL_MS, runOnStart: false, handler: reapTransientAgents },
-  { id: "rate-limit-resume", title: "Rate-limit resume", description: "Auto-resume agents held on a provider usage/rate-limit stall once their reset window has passed (#286).", intervalMs: REAP_INTERVAL_MS, runOnStart: false, handler: resumeRateLimitedAgents },
+  { id: "transient-agent-reaper", title: "Transient agent reaper", description: "Cleanly shut down transient spawned agents once they are idle and any isolated branch work has landed.", intervalMs: REAP_INTERVAL_MS, runOnStart: false, handler: () => reapTransientAgents() },
+  { id: "rate-limit-resume", title: "Rate-limit resume", description: "Auto-resume agents held on a provider usage/rate-limit stall once their reset window has passed (#286).", intervalMs: REAP_INTERVAL_MS, runOnStart: false, handler: () => resumeRateLimitedAgents() },
   {
     id: "stuck-busy-watchdog",
     title: "Stuck busy watchdog",
     description: "Warn when a managed provider stays busy past the threshold without provider progress (#53).",
     intervalMs: REAP_INTERVAL_MS,
     runOnStart: false,
-    handler: runStuckBusyWatchdog,
+    handler: () => runStuckBusyWatchdog(),
   },
   {
     id: "team-reap",
@@ -341,7 +345,7 @@ export const definitions: MaintenanceJobDefinition[] = [
     description: "Gently ping a team's current coordinator once when the team has had no busy members for the configured threshold.",
     intervalMs: REAP_INTERVAL_MS,
     runOnStart: false,
-    handler: runTeamIdleWatchdog,
+    handler: () => runTeamIdleWatchdog(),
   },
   {
     id: "orchestrator-reaper",
@@ -373,9 +377,9 @@ export const definitions: MaintenanceJobDefinition[] = [
     description: "Delete messages outside the configured retention window.",
     intervalMs: DAY_MS,
     runOnStart: false,
-    handler() {
+    handler(context) {
       const retentionDays = Number(process.env.RETENTION_DAYS) || 30;
-      return { prunedMessages: pruneOldMessages(retentionDays * DAY_MS) };
+      return pruneOldMessagesAsync(retentionDays * DAY_MS, { signal: context?.signal });
     },
   },
   {
@@ -385,10 +389,12 @@ export const definitions: MaintenanceJobDefinition[] = [
     intervalMs: DB_MAINTENANCE_INTERVAL_MS,
     runOnStart: false,
     timeoutMs: 5 * 60 * 1000,
-    async handler() {
+    async handler(context) {
       dbMaintenanceRuns += 1;
-      const vacuum = DB_VACUUM_EVERY > 0 && dbMaintenanceRuns % DB_VACUUM_EVERY === 0;
-      return runDbMaintenanceAsync({ vacuum });
+      const vacuumDue = DB_VACUUM_EVERY > 0 && dbMaintenanceRuns % DB_VACUUM_EVERY === 0;
+      const vacuum = vacuumDue && isFleetIdleForVacuum();
+      const result = await runDbMaintenanceAsync({ vacuum, signal: context?.signal });
+      return vacuumDue && !vacuum ? { ...result, vacuumSkipped: "fleet-busy" } : result;
     },
   },
   {
@@ -492,7 +498,7 @@ export const definitions: MaintenanceJobDefinition[] = [
     intervalMs: 60 * 1000,
     runOnStart: false,
     timeoutMs: 10 * 1000,
-    handler: runAutoMergeWatchdog,
+    handler: () => runAutoMergeWatchdog(),
   },
   {
     id: "workspace-idle-refresh",

package/src/maintenance/scheduler.ts

@@ -118,8 +118,9 @@ async function runJob(definition: MaintenanceJobDefinition, options: { force?: b
     return { id: definition.id, status: "skipped", startedAt, finishedAt: Date.now(), durationMs: 0, result: { reason: "not due or already running", state } };
   }
 
+  const abortController = new AbortController();
   try {
-    const result = await withTimeout(Promise.resolve(definition.handler()), timeoutMs);
+    const result = await withTimeout(Promise.resolve(definition.handler({ signal: abortController.signal })), timeoutMs, abortController);
     const finishedAt = Date.now();
     const durationMs = finishedAt - startedAt;
     db.query(`
@@ -145,10 +146,14 @@ async function runJob(definition: MaintenanceJobDefinition, options: { force?: b
   }
 }
 
-async function withTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T> {
+async function withTimeout<T>(promise: Promise<T>, timeoutMs: number, abortController?: AbortController): Promise<T> {
   let timeout: Timer | undefined;
   const timeoutPromise = new Promise<never>((_, reject) => {
-    timeout = setTimeout(() => reject(new Error(`maintenance job timed out after ${timeoutMs}ms`)), timeoutMs);
+    timeout = setTimeout(() => {
+      const error = new Error(`maintenance job timed out after ${timeoutMs}ms`);
+      abortController?.abort(error);
+      reject(error);
+    }, timeoutMs);
   });
   try {
     return await Promise.race([promise, timeoutPromise]);

package/src/maintenance/types.ts

@@ -1,5 +1,9 @@
 import type { MaintenanceJob } from "../types";
 
+export interface MaintenanceJobContext {
+  signal: AbortSignal;
+}
+
 export interface MaintenanceJobDefinition {
   id: string;
   title: string;
@@ -7,7 +11,7 @@ export interface MaintenanceJobDefinition {
   intervalMs: number;
   timeoutMs?: number;
   runOnStart?: boolean;
-  handler: () => Promise<Record<string, unknown>> | Record<string, unknown>;
+  handler: (context?: MaintenanceJobContext) => Promise<Record<string, unknown>> | Record<string, unknown>;
 }
 
 export interface MaintenanceJobRow {

package/src/routes/sse.ts

@@ -5,5 +5,6 @@ import { type Handler } from "./_shared";
 export const getEvents: Handler = (req) => {
   const url = new URL(req.url);
   const agentId = url.searchParams.get("for") || null;
-  return createSSEStream(agentId);
+  const lastEventId = Number(req.headers.get("last-event-id") ?? "");
+  return createSSEStream(agentId, Number.isSafeInteger(lastEventId) && lastEventId > 0 ? lastEventId : 0);
 };

package/src/services/git-process.ts

@@ -0,0 +1,61 @@
+export const LAND_GIT_TIMEOUT_MS = 2_000;
+
+export interface GitProcessResult {
+  stdout: string;
+  stderr: string;
+  exitCode: number;
+  timedOut: boolean;
+}
+
+export async function runGit(args: string[], timeoutMs = LAND_GIT_TIMEOUT_MS): Promise<GitProcessResult> {
+  const proc = Bun.spawn(["git", ...args], {
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+  const stdoutPromise = streamText(proc.stdout);
+  const stderrPromise = streamText(proc.stderr);
+  const timedOut = await waitForExitOrTimeout(proc, timeoutMs);
+  const [stdout, stderr] = timedOut
+    ? await Promise.all([settleText(stdoutPromise), settleText(stderrPromise)])
+    : await Promise.all([stdoutPromise, stderrPromise]);
+  return { stdout, stderr, exitCode: proc.exitCode ?? 1, timedOut };
+}
+
+async function streamText(stream: ReadableStream<Uint8Array> | null): Promise<string> {
+  if (!stream) return "";
+  try {
+    return await new Response(stream).text();
+  } catch {
+    return "";
+  }
+}
+
+async function settleText(promise: Promise<string>): Promise<string> {
+  return Promise.race([promise, new Promise<string>((resolve) => setTimeout(() => resolve(""), 25))]);
+}
+
+async function waitForExitOrTimeout(proc: Bun.Subprocess<"ignore", "pipe", "pipe">, timeoutMs: number | undefined): Promise<boolean> {
+  if (!timeoutMs || timeoutMs <= 0) {
+    await proc.exited;
+    return false;
+  }
+  let timedOut = false;
+  let kill: ReturnType<typeof setTimeout> | undefined;
+  const timeout = setTimeout(() => {
+    timedOut = true;
+    try { proc.kill("SIGTERM"); } catch {}
+    kill = setTimeout(() => {
+      try { proc.kill("SIGKILL"); } catch {}
+    }, 1_000);
+    kill.unref?.();
+  }, timeoutMs);
+  timeout.unref?.();
+  try {
+    await proc.exited;
+  } finally {
+    clearTimeout(timeout);
+    if (kill) clearTimeout(kill);
+  }
+  return timedOut;
+}

package/src/services/git-remote.ts

@@ -3,6 +3,9 @@
 // not drift: issue-lifecycle land-close (which repo a bare `#NNN` in a commit subject
 // closes) AND project auto-seed (a project's `issueRepo` for chat #NNN linkify). Promoted
 // out of issue-lifecycle.ts where it was private — see the DRY rule in CLAUDE.md.
+import { runGit } from "./git-process";
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 
 /**
  * `owner/repo` out of any git remote URL form: `git@github.com:owner/repo.git`,
@@ -24,12 +27,7 @@ export async function remoteUrlFromGitRemoteAsync(repoRoot: string | undefined):
   if (remoteUrlCache.has(repoRoot)) return remoteUrlCache.get(repoRoot);
   let url: string | undefined;
   try {
-    const proc = Bun.spawn(["git", "-C", repoRoot, "remote", "get-url", "origin"], {
-      stdin: "ignore",
-      stdout: "pipe",
-      stderr: "ignore",
-    });
-    const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
+    const { stdout, exitCode } = await runGit(["-C", repoRoot, "remote", "get-url", "origin"]);
     if (exitCode === 0) url = stdout.trim() || undefined;
   } catch {
     url = undefined;
@@ -42,17 +40,7 @@ export function remoteUrlFromGitRemote(repoRoot: string | undefined): string | u
   if (!repoRoot) return undefined;
   if (!remoteUrlCache) remoteUrlCache = new Map();
   if (remoteUrlCache.has(repoRoot)) return remoteUrlCache.get(repoRoot);
-  let url: string | undefined;
-  try {
-    const proc = Bun.spawnSync(["git", "-C", repoRoot, "remote", "get-url", "origin"], {
-      stdin: "ignore",
-      stdout: "pipe",
-      stderr: "ignore",
-    });
-    if (proc.exitCode === 0) url = Buffer.from(proc.stdout).toString("utf8").trim() || undefined;
-  } catch {
-    url = undefined;
-  }
+  const url = remoteUrlFromGitConfig(repoRoot);
   remoteUrlCache.set(repoRoot, url);
   return url;
 }
@@ -84,3 +72,66 @@ export function __resetRemoteRepoCacheForTests(): void {
   remoteRepoCache = undefined;
   remoteUrlCache = undefined;
 }
+
+function remoteUrlFromGitConfig(repoRoot: string): string | undefined {
+  const gitDir = findGitDir(repoRoot);
+  if (!gitDir) return undefined;
+  return originUrlFromConfig(join(gitDir, "config")) ?? originUrlFromConfig(join(commonGitDir(gitDir) ?? gitDir, "config"));
+}
+
+function findGitDir(start: string): string | undefined {
+  let dir = resolve(start);
+  while (true) {
+    const marker = join(dir, ".git");
+    try {
+      const stat = statSync(marker);
+      if (stat.isDirectory()) return marker;
+      if (stat.isFile()) return gitDirFromFile(marker, dir);
+    } catch {}
+    const parent = dirname(dir);
+    if (parent === dir) return undefined;
+    dir = parent;
+  }
+}
+
+function gitDirFromFile(marker: string, worktreeRoot: string): string | undefined {
+  try {
+    const content = readFileSync(marker, "utf8").trim();
+    const match = content.match(/^gitdir:\s*(.+)$/i);
+    if (!match?.[1]) return undefined;
+    return isAbsolute(match[1]) ? match[1] : resolve(worktreeRoot, match[1]);
+  } catch {
+    return undefined;
+  }
+}
+
+function commonGitDir(gitDir: string): string | undefined {
+  const commonDirFile = join(gitDir, "commondir");
+  if (!existsSync(commonDirFile)) return undefined;
+  try {
+    const common = readFileSync(commonDirFile, "utf8").trim();
+    if (!common) return undefined;
+    return isAbsolute(common) ? common : resolve(gitDir, common);
+  } catch {
+    return undefined;
+  }
+}
+
+function originUrlFromConfig(configPath: string): string | undefined {
+  let inOrigin = false;
+  try {
+    for (const line of readFileSync(configPath, "utf8").split(/\r?\n/)) {
+      const section = line.match(/^\s*\[(.+)]\s*$/);
+      if (section) {
+        inOrigin = /^remote\s+"origin"$/.test(section[1]!.trim());
+        continue;
+      }
+      if (!inOrigin) continue;
+      const url = line.match(/^\s*url\s*=\s*(.+?)\s*$/);
+      if (url?.[1]) return url[1].trim() || undefined;
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+}

package/src/services/task-lifecycle.ts

@@ -38,6 +38,7 @@ import { routeNotification } from "../notification-router";
 import { resolveCoordinatorAgentId } from "../steward-identity";
 import { isAgentExitDoneWhen, stageSatisfiesDoneWhen } from "./task-done-when";
 import { emitTaskSemanticNotification, type TaskSemanticTransition } from "./task-semantic-events";
+import { runGit } from "./git-process";
 import type { IssueRef, TaskDeliverableStage, TaskGateState, WorkspaceRecord } from "../types";
 import type { IssueTrackerAdapter } from "../issue-tracker";
 
@@ -107,12 +108,7 @@ async function landedDiffSummary(input: LandedTaskLifecycleInput, log: LogFn): P
   const tipSha = input.mergedSha?.trim();
   if (!repoRoot || !baseSha || !tipSha || baseSha === tipSha) return undefined;
   try {
-    const proc = Bun.spawn(["git", "-C", repoRoot, "diff", "--shortstat", `${baseSha}..${tipSha}`], {
-      stdin: "ignore",
-      stdout: "pipe",
-      stderr: "pipe",
-    });
-    const [stdout, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
+    const { stdout, exitCode } = await runGit(["-C", repoRoot, "diff", "--shortstat", `${baseSha}..${tipSha}`]);
     if (exitCode !== 0) return undefined;
     const out = stdout.trim();
     return out || undefined;