chatroom-cli 1.98.6 → 1.98.7

package/dist/index.js

@@ -84014,8 +84014,76 @@ async function logDaemonAuditEvent(logEvent, event) {
   });
 }
 
+// src/daemon/infrastructure/inbox/task-snapshot-state.ts
+function snapshotKey(taskId, role) {
+  return `${taskId}:${role.toLowerCase()}`;
+}
+
+class MachineTaskSnapshotState {
+  snapshots = new Map;
+  replace(snapshots) {
+    this.snapshots.clear();
+    this.upsert(snapshots);
+  }
+  applySignalPage(signals, snapshots) {
+    const snapshotsByKey = new Map(snapshots.map((snapshot) => [
+      snapshotKey(snapshot.taskId, snapshot.agentConfig.role),
+      snapshot
+    ]));
+    for (const signal of signals) {
+      const key = snapshotKey(signal.taskId, signal.targetRole);
+      const snapshot = snapshotsByKey.get(key);
+      if (snapshot) {
+        this.snapshots.set(key, snapshot);
+      } else {
+        this.snapshots.delete(key);
+      }
+    }
+  }
+  listForRole(chatroomId, role) {
+    const roleLower = role.toLowerCase();
+    return [...this.snapshots.values()].filter((snapshot) => snapshot.chatroomId === chatroomId && snapshot.agentConfig.role.toLowerCase() === roleLower);
+  }
+  listAll() {
+    return [...this.snapshots.values()];
+  }
+  setDesiredState(chatroomId, role, desiredState) {
+    const roleLower = role.toLowerCase();
+    for (const [key, snapshot] of this.snapshots) {
+      if (snapshot.chatroomId !== chatroomId || snapshot.agentConfig.role.toLowerCase() !== roleLower) {
+        continue;
+      }
+      this.snapshots.set(key, {
+        ...snapshot,
+        agentConfig: { ...snapshot.agentConfig, desiredState }
+      });
+    }
+  }
+  upsert(snapshots) {
+    for (const snapshot of snapshots) {
+      this.snapshots.set(snapshotKey(snapshot.taskId, snapshot.agentConfig.role), snapshot);
+    }
+  }
+}
+
+// src/daemon/entry/native-delivery/native-delivery-session-registry.ts
+function registerNativeDeliverySession(ctx) {
+  registered = {
+    ...ctx,
+    taskSnapshotState: ctx.taskSnapshotState ?? new MachineTaskSnapshotState
+  };
+}
+function unregisterNativeDeliverySession() {
+  registered = null;
+}
+function getNativeDeliverySession() {
+  return registered;
+}
+var registered = null;
+var init_native_delivery_session_registry = () => {};
+
 // ../../services/backend/config/reliability.ts
-var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, NATIVE_DELIVERY_RECONCILE_MS = 1e4, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, OBSERVED_FULL_PUSH_INTERVAL_MS, OBSERVED_SYNC_RECONCILE_MS, WORKSPACE_RECENCY_WINDOW_MS, WORKSPACE_LIST_RECONCILE_MS, CONNECTION_CLOSE_REQUEST_TTL_MS, ENHANCER_TERMINAL_JOB_RETENTION_MS;
+var HARNESS_SESSION_READY_TIMEOUT_MS = 5000, DAEMON_HEARTBEAT_INTERVAL_MS, DAEMON_HEARTBEAT_TTL_MS, AGENT_REQUEST_DEADLINE_MS = 120000, OBSERVED_FULL_PUSH_INTERVAL_MS, OBSERVED_SYNC_RECONCILE_MS, WORKSPACE_RECENCY_WINDOW_MS, WORKSPACE_LIST_RECONCILE_MS, CONNECTION_CLOSE_REQUEST_TTL_MS, ENHANCER_TERMINAL_JOB_RETENTION_MS;
 var init_reliability = __esm(() => {
   DAEMON_HEARTBEAT_INTERVAL_MS = 5 * 60000;
   DAEMON_HEARTBEAT_TTL_MS = 6 * DAEMON_HEARTBEAT_INTERVAL_MS;
@@ -98860,16 +98928,16 @@ function explainAgentReadyForNativeDeliveryBlock(task, slot) {
   if (!isAgentDesiredRunning(agentConfig.desiredState)) {
     return `desired_state_not_running (desiredState=${agentConfig.desiredState})`;
   }
-  if (agentConfig.spawnedAgentPid == null) {
-    return "spawned_pid_missing";
-  }
   if (!slot) {
-    return `slot_missing (expectedPid=${agentConfig.spawnedAgentPid})`;
+    return agentConfig.spawnedAgentPid == null ? "spawned_pid_missing" : `slot_missing (expectedPid=${agentConfig.spawnedAgentPid})`;
   }
   if (!isSlotRunning(slot.state)) {
-    return `slot_not_running (slotState=${slot.state}, expectedPid=${agentConfig.spawnedAgentPid})`;
+    return `slot_not_running (slotState=${slot.state}, expectedPid=${agentConfig.spawnedAgentPid ?? "none"})`;
+  }
+  if (slot.pid == null) {
+    return "slot_pid_missing";
   }
-  if (slot.pid !== agentConfig.spawnedAgentPid) {
+  if (agentConfig.spawnedAgentPid != null && slot.pid !== agentConfig.spawnedAgentPid) {
     return `pid_mismatch (slotPid=${slot.pid ?? "none"}, snapshotPid=${agentConfig.spawnedAgentPid})`;
   }
   if (typeof slot.harnessSessionId !== "string" || slot.harnessSessionId.length === 0) {
@@ -98911,18 +98979,6 @@ function logNativeDeliveryNoTasks(role, chatroomId) {
   console.log(`[NativeDelivery:skip] ${role}@${chatroomId} — no pending tasks for role`);
 }
 
-// src/daemon/entry/native-delivery/native-delivery-session-registry.ts
-function registerNativeDeliverySession(ctx) {
-  registered = ctx;
-}
-function unregisterNativeDeliverySession() {
-  registered = null;
-}
-function getNativeDeliverySession() {
-  return registered;
-}
-var registered = null;
-
 // src/daemon/entry/native-delivery/native-stale-turn-phase.ts
 function isStaleTurnInFlightWhileWaiting(task, slot) {
   if (!slot || isTurnPhaseIdle(slot.nativeTurnPhase ?? "idle"))
@@ -99409,23 +99465,6 @@ function mapAssignedTaskSnapshotList(rows) {
   return rows.map(mapAssignedTaskSnapshot);
 }
 
-// src/daemon/infrastructure/inbox/fetch-machine-assigned-task-snapshots.ts
-async function fetchMachineAssignedTaskSnapshots(sessionDeps, machineId) {
-  const result = await sessionDeps.backend.query(api.machines.listMachineAssignedTaskSnapshots, {
-    sessionId: sessionDeps.sessionId,
-    machineId
-  });
-  return mapAssignedTaskSnapshotList(parseAssignedTaskSnapshotRows(result?.tasks ?? []));
-}
-function filterSnapshotsForRole(snapshots, chatroomId, role) {
-  const roleLower = role.toLowerCase();
-  return snapshots.filter((row) => row.chatroomId === chatroomId && row.agentConfig.role.toLowerCase() === roleLower);
-}
-var init_fetch_machine_assigned_task_snapshots = __esm(() => {
-  init_assigned_task_snapshot_contract();
-  init_api3();
-});
-
 // src/daemon/entry/restart-orchestrator-in-flight.ts
 function roleKey(chatroomId, role) {
   return `${chatroomId}:${role.toLowerCase()}`;
@@ -99517,22 +99556,18 @@ class NativeTaskDeliveryCoordinator {
     if (!session2)
       return;
     const { runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = session2;
-    fetchMachineAssignedTaskSnapshots(sessionDeps, machineId).then((all8) => {
-      const tasks = filterSnapshotsForRole(all8, chatroomId, role);
-      if (tasks.length === 0) {
-        logNativeDeliveryNoTasks(role, chatroomId);
-        return;
-      }
-      this.reconcileAssignedTasks({
-        tasks,
-        runtime: runtime4,
-        effectContext: effectContext2,
-        agentMgr,
-        sessionDeps,
-        machineId
-      });
-    }).catch((err) => {
-      console.warn(`[NativeTaskDelivery] rehydrate failed for ${role}@${chatroomId}: ${getErrorMessage(err)}`);
+    const tasks = session2.taskSnapshotState?.listForRole(chatroomId, role) ?? [];
+    if (tasks.length === 0) {
+      logNativeDeliveryNoTasks(role, chatroomId);
+      return;
+    }
+    this.reconcileAssignedTasks({
+      tasks,
+      runtime: runtime4,
+      effectContext: effectContext2,
+      agentMgr,
+      sessionDeps,
+      machineId
     });
   }
   reconcileAssignedTasks(params) {
@@ -99652,13 +99687,13 @@ function notifyNativeTurnIdle(params) {
 var coordinator;
 var init_native_task_delivery_coordinator = __esm(() => {
   init_esm();
+  init_native_delivery_session_registry();
   init_native_stale_turn_phase();
   init_native_task_injector_logic();
   init_native_task_injector();
   init_api3();
   init_assigned_task();
   init_convex_error();
-  init_fetch_machine_assigned_task_snapshots();
   init_restart_orchestrator_in_flight();
 });
 
@@ -99880,15 +99915,23 @@ var init_restart_orchestrator = __esm(() => {
 function createStartAgentDeps(agentMgr, session2) {
   return {
     agentProcessManager: {
-      ensureRunning: async (args2) => exports_Effect.runPromise(agentMgr.ensureRunning({
-        chatroomId: args2.chatroomId,
-        role: args2.role,
-        agentHarness: args2.agentHarness,
-        model: args2.model,
-        workingDir: args2.workingDir,
-        reason: args2.reason,
-        wantResume: args2.wantResume
-      }))
+      ensureRunning: async (args2) => {
+        const taskSnapshotState = getNativeDeliverySession()?.taskSnapshotState;
+        taskSnapshotState?.setDesiredState(args2.chatroomId, args2.role, "running");
+        const result = await exports_Effect.runPromise(agentMgr.ensureRunning({
+          chatroomId: args2.chatroomId,
+          role: args2.role,
+          agentHarness: args2.agentHarness,
+          model: args2.model,
+          workingDir: args2.workingDir,
+          reason: args2.reason,
+          wantResume: args2.wantResume
+        }));
+        if (!result.success) {
+          taskSnapshotState?.setDesiredState(args2.chatroomId, args2.role, "stopped");
+        }
+        return result;
+      }
     },
     session: {
       sessionId: session2.sessionId,
@@ -100009,6 +100052,7 @@ function createRecoverAgentStateDeps(agentMgr, session2) {
 var init_agent_control_bridge = __esm(() => {
   init_esm();
   init_api3();
+  init_native_delivery_session_registry();
   init_restart_orchestrator();
 });
 
@@ -115783,7 +115827,7 @@ function isSlotUnavailableForPid(slot, pid, isPidAlive, now = Date.now()) {
 function isNativeRevivableTaskStatus(task) {
   const { status: status3 } = task;
   if (status3 === "pending") {
-    return task.agentConfig.spawnedAgentPid != null;
+    return true;
   }
   if (status3 === "acknowledged") {
     return task.assignedTo?.toLowerCase() === task.agentConfig.role.toLowerCase();
@@ -116072,7 +116116,7 @@ async function wakeStoppedAgentsForPendingTasks(tasks, now, cooldown, runtime4,
   }
 }
 async function processTasksUpdate(runtime4, effectContext2, cooldown, agentMgr, sessionDeps, machineId, _pass, options) {
-  const tasks = options?.snapshots ? [...options.snapshots] : await fetchMachineAssignedTaskSnapshots(sessionDeps, machineId);
+  const tasks = [...options.snapshots];
   const filteredTasks = filterSnapshotsExcludingRestartInFlight(tasks);
   if (filteredTasks.length === 0)
     return;
@@ -116104,11 +116148,23 @@ var init_task_delivery_processor = __esm(() => {
   init_native_task_injector_logic();
   init_api3();
   init_convex_error();
-  init_fetch_machine_assigned_task_snapshots();
   init_restart_orchestrator_in_flight();
   init_task_delivery_logic();
 });
 
+// src/daemon/infrastructure/inbox/fetch-machine-assigned-task-snapshots.ts
+async function fetchMachineAssignedTaskSnapshots(sessionDeps, machineId) {
+  const result = await sessionDeps.backend.query(api.machines.listMachineAssignedTaskSnapshots, {
+    sessionId: sessionDeps.sessionId,
+    machineId
+  });
+  return mapAssignedTaskSnapshotList(parseAssignedTaskSnapshotRows(result?.tasks ?? []));
+}
+var init_fetch_machine_assigned_task_snapshots = __esm(() => {
+  init_assigned_task_snapshot_contract();
+  init_api3();
+});
+
 // src/daemon/infrastructure/inbox/store/schema.ts
 var SCHEMA_VERSION = 1, MIGRATIONS;
 var init_schema = __esm(() => {
@@ -116261,11 +116317,14 @@ var init_inbox = __esm(() => {
 
 // src/daemon/infrastructure/inbox/task-inbox-delivery.ts
 async function handleTaskInboxUpdate(update6, deps) {
+  const taskSnapshotState = deps.taskSnapshotState ?? getNativeDeliverySession()?.taskSnapshotState;
+  taskSnapshotState?.applySignalPage(update6.signals, update6.snapshots);
   if (update6.snapshots.length === 0)
     return;
-  await processTasksUpdate(deps.runtime, deps.effectContext, deps.cooldown, deps.agentMgr, deps.sessionDeps, deps.machineId, "inbox-signal");
+  await processTasksUpdate(deps.runtime, deps.effectContext, deps.cooldown, deps.agentMgr, deps.sessionDeps, deps.machineId, "inbox-signal", { snapshots: update6.snapshots });
 }
 var init_task_inbox_delivery = __esm(() => {
+  init_native_delivery_session_registry();
   init_task_delivery_processor();
 });
 
@@ -116381,6 +116440,7 @@ async function bootstrapMachineAssignedTaskSnapshots(deps) {
     machineId: deps.machineId
   });
   const tasks = await fetchMachineAssignedTaskSnapshots(deps.sessionDeps, deps.machineId);
+  deps.taskSnapshotState?.replace(tasks);
   if (!tasks.length)
     return;
   await processTasksUpdate(deps.runtime, deps.effectContext, deps.cooldown, deps.agentMgr, deps.sessionDeps, deps.machineId, "bootstrap", { snapshots: tasks });
@@ -116403,7 +116463,7 @@ async function runInboxLoopWithRestart(options, onUpdate, isStopped) {
     }
   }
 }
-var INBOX_RESTART_INITIAL_MS = 1000, INBOX_RESTART_MAX_MS = 30000, startTaskInboxEffect = (wsClient2) => exports_Effect.gen(function* () {
+var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_RESTART_MAX_MS = 30000, startTaskInboxEffect = (wsClient2) => exports_Effect.gen(function* () {
   const session2 = yield* DaemonSessionService;
   const agentMgr = yield* DaemonAgentProcessManagerService;
   const effectContext2 = yield* exports_Effect.context();
@@ -116426,14 +116486,18 @@ var INBOX_RESTART_INITIAL_MS = 1000, INBOX_RESTART_MAX_MS = 30000, startTaskInbo
   });
   const abort = new AbortController;
   let stopped = false;
+  const taskSnapshotState = new MachineTaskSnapshotState;
   registerNativeDeliverySession({
     runtime: runtime4,
     effectContext: effectContext2,
     agentMgr,
     sessionDeps,
-    machineId: session2.machineId
+    machineId: session2.machineId,
+    taskSnapshotState
   });
   const cooldown = new RecoveryCooldown;
+  let inboxUpdateInFlight = false;
+  let reconcileInFlight = false;
   const inboxOptions = {
     client: wsClient2,
     sessionId: session2.sessionId,
@@ -116443,32 +116507,44 @@ var INBOX_RESTART_INITIAL_MS = 1000, INBOX_RESTART_MAX_MS = 30000, startTaskInbo
     signal: abort.signal
   };
   const inboxHandler = async (update6) => {
-    await handleTaskInboxUpdate(update6, {
-      runtime: runtime4,
-      effectContext: effectContext2,
-      cooldown,
-      agentMgr,
-      sessionDeps,
-      machineId: session2.machineId
-    });
-    inboxStore.save({ inboxType: "task", scopeKey: session2.machineId }, { afterSignalKey: update6.throughSignalKey });
+    inboxUpdateInFlight = true;
+    try {
+      await handleTaskInboxUpdate(update6, {
+        runtime: runtime4,
+        effectContext: effectContext2,
+        cooldown,
+        agentMgr,
+        sessionDeps,
+        machineId: session2.machineId,
+        taskSnapshotState
+      });
+      inboxStore.save({ inboxType: "task", scopeKey: session2.machineId }, { afterSignalKey: update6.throughSignalKey });
+    } finally {
+      inboxUpdateInFlight = false;
+    }
   };
-  const reconcileTimer = setInterval(() => {
-    if (stopped)
-      return;
-    processTasksUpdate(runtime4, effectContext2, cooldown, agentMgr, sessionDeps, session2.machineId, "periodic-reconcile");
-  }, NATIVE_DELIVERY_RECONCILE_MS);
   yield* exports_Effect.tryPromise(() => bootstrapMachineAssignedTaskSnapshots({
     sessionDeps,
     runtime: runtime4,
     effectContext: effectContext2,
     cooldown,
     agentMgr,
-    machineId: session2.machineId
+    machineId: session2.machineId,
+    taskSnapshotState
   })).pipe(exports_Effect.catchAll((error51) => {
     console.warn("[TaskInbox] bootstrap failed:", error51);
     return exports_Effect.void;
   }));
+  const reconcileTimer = setInterval(() => {
+    if (stopped || inboxUpdateInFlight || reconcileInFlight)
+      return;
+    reconcileInFlight = true;
+    processTasksUpdate(runtime4, effectContext2, cooldown, agentMgr, sessionDeps, session2.machineId, "periodic-reconcile", { snapshots: taskSnapshotState.listAll() }).catch((error51) => {
+      console.warn("[TaskInbox] local delivery reconciliation failed:", error51);
+    }).finally(() => {
+      reconcileInFlight = false;
+    });
+  }, NATIVE_DELIVERY_RECONCILE_MS);
   runInboxLoopWithRestart(inboxOptions, inboxHandler, () => stopped);
   return {
     stop() {
@@ -116481,10 +116557,10 @@ var INBOX_RESTART_INITIAL_MS = 1000, INBOX_RESTART_MAX_MS = 30000, startTaskInbo
   };
 });
 var init_task_inbox_runtime = __esm(() => {
-  init_reliability();
   init_esm();
   init_daemon_services();
   init_api3();
+  init_native_delivery_session_registry();
   init_task_delivery_processor();
   init_task_delivery_logic();
   init_fetch_machine_assigned_task_snapshots();
@@ -118163,10 +118239,10 @@ function startWorkspaceListSubscriber(deps, onEvent) {
   const unsub = deps.wsClient.onUpdate(api.workspaces.listRecentlyObservedWorkspacesForMachine, queryArgs, (workspaces) => {
     if (workspaces == null)
       return;
-    const snapshotKey = JSON.stringify(workspaces);
-    if (snapshotKey === lastSnapshotKey)
+    const snapshotKey2 = JSON.stringify(workspaces);
+    if (snapshotKey2 === lastSnapshotKey)
       return;
-    lastSnapshotKey = snapshotKey;
+    lastSnapshotKey = snapshotKey2;
     onEvent({ type: "workspace.list-changed", machineId: deps.machineId });
   }, (err) => {
     console.warn(`[daemon] workspace-list subscriber error: ${err instanceof Error ? err.message : String(err)}`);
@@ -134010,4 +134086,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=654C294BE572C9D764756E2164756E21
+//# debugId=D3E73C85EB221DCE64756E2164756E21