chatroom-cli 1.103.2 → 1.105.0

package/dist/index.js

@@ -29328,8 +29328,13 @@ var init_claude_model_variants = __esm(() => {
     {},
     ...CLAUDE_EFFORT_VALUES.map((effort) => ({ effort }))
   ];
-  CLAUDE_SPAWN_ALIASES = ["opus", "sonnet", "haiku"];
+  CLAUDE_SPAWN_ALIASES = [];
   CLAUDE_CATALOG_BASE_MODEL_IDS = [
+    "opus",
+    "sonnet",
+    "haiku",
+    "claude-opus-5",
+    "claude-sonnet-5",
     "claude-opus-4-8",
     "claude-opus-4-6",
     "claude-sonnet-4-6",
@@ -100823,6 +100828,24 @@ class AgentOperationalReadModel {
     }
     return changed;
   }
+  applySignalPage(rows, removed) {
+    const changed = [];
+    for (const row of rows) {
+      const key = roleKey(row.chatroomId, row.role);
+      const prev = this.rows.get(key);
+      if (!prev || prev.revisionKey !== row.revisionKey) {
+        changed.push({ chatroomId: row.chatroomId, role: row.role });
+      }
+      this.rows.set(key, row);
+    }
+    for (const item of removed) {
+      const key = roleKey(item.chatroomId, item.role);
+      if (this.rows.has(key))
+        changed.push(item);
+      this.rows.delete(key);
+    }
+    return changed;
+  }
   get(chatroomId, role) {
     return this.rows.get(roleKey(chatroomId, role));
   }
@@ -100836,9 +100859,11 @@ function snapshotKey(taskId, role) {
 
 class MachineTaskSnapshotState {
   snapshots = new Map;
+  initialized = false;
   replace(snapshots) {
     this.snapshots.clear();
     this.upsert(snapshots);
+    this.initialized = true;
   }
   applySignalPage(signals, snapshots) {
     const snapshotsByKey = new Map(snapshots.map((snapshot) => [
@@ -100859,6 +100884,13 @@ class MachineTaskSnapshotState {
     const roleLower = role.toLowerCase();
     return [...this.snapshots.values()].filter((snapshot) => snapshot.chatroomId === chatroomId && snapshot.agentConfig.role.toLowerCase() === roleLower);
   }
+  isInitialized() {
+    return this.initialized;
+  }
+  getForRole(chatroomId, role, taskId) {
+    const snapshot = this.snapshots.get(snapshotKey(taskId, role));
+    return snapshot?.chatroomId === chatroomId ? snapshot : null;
+  }
   listAll() {
     return [...this.snapshots.values()];
   }
@@ -103195,6 +103227,27 @@ var init_native_harness_session_exit = __esm(() => {
   init_native_task_delivery_coordinator();
 });
 
+// src/daemon/entry/native-delivery/native-turn-end-inbox.ts
+function decideNativeTurnEndFromInbox(params) {
+  const session2 = getNativeDeliverySession();
+  if (!params.taskId || !session2)
+    return "unknown";
+  const { taskSnapshotState } = session2;
+  if (!taskSnapshotState.isInitialized())
+    return "unknown";
+  const task = taskSnapshotState.getForRole(params.chatroomId, params.role, params.taskId);
+  return task ? ACTIVE_TASK_DECISIONS[task.status] : "handoff-completed";
+}
+var ACTIVE_TASK_DECISIONS;
+var init_native_turn_end_inbox = __esm(() => {
+  init_native_delivery_session_registry();
+  ACTIVE_TASK_DECISIONS = {
+    pending: "unknown",
+    acknowledged: "unknown",
+    in_progress: "needs-handoff-reminder"
+  };
+});
+
 // src/daemon/domain/entities/native-turn-phase.ts
 var init_native_turn_phase = () => {};
 
@@ -103659,6 +103712,25 @@ class AgentProcessManager {
       console.log(`[AgentProcessManager] ✅ Handled rapid resume storm for ${opts.role}`);
       return;
     }
+    const inboxDecision = decideNativeTurnEndFromInbox({
+      chatroomId: opts.chatroomId,
+      role: opts.role,
+      taskId: slot?.lastInFlightTaskId
+    });
+    if (inboxDecision === "needs-handoff-reminder") {
+      await this.injectHarnessReminder(opts.chatroomId, opts.role, NATIVE_HANDOFF_REMINDER);
+      console.log(`[AgentProcessManager] ⏩ Handoff reminder injected for ${opts.role} (inbox)`);
+      return;
+    }
+    if (inboxDecision === "handoff-completed") {
+      if (slot) {
+        setNativeTurnPhase(slot, defaultNativeTurnPhase());
+        this.clearLastInFlightTask(opts.chatroomId, opts.role);
+      }
+      notifyNativeTurnIdle({ chatroomId: opts.chatroomId, role: opts.role });
+      console.log(`[AgentProcessManager] ✅ Native agent_end handled for ${opts.role} (inbox)`);
+      return;
+    }
     try {
       const result = await this.deps.backend.mutation(api.participants.handleNativeAgentEnd, {
         sessionId: this.deps.sessionId,
@@ -104989,6 +105061,7 @@ var init_agent_process_manager = __esm(() => {
   init_orphan_tracker();
   init_native_harness_session_exit();
   init_native_task_delivery_coordinator();
+  init_native_turn_end_inbox();
   init_native_turn_phase2();
   init_native_spawn_presence();
   init_no_op_session_monitor();
@@ -116098,26 +116171,34 @@ async function stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegist
   await deltaOutboxRegistry?.stop(normalized);
 }
 async function drainPendingFileTreeReleaseRequests(session2, coordinators, checkpointOutboxRegistry, deltaOutboxRegistry) {
-  const releases = await session2.backend.query(api.workspaceFiles.getPendingFileTreeReleaseRequests, {
-    sessionId: session2.sessionId,
-    machineId: session2.machineId
-  });
-  if (!releases?.length)
-    return;
-  const releasesByDir = new Set;
-  for (const release of releases) {
-    releasesByDir.add(normalizeWorkingDirForLookup(release.workingDir));
-  }
-  for (const normalized of releasesByDir) {
-    await stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegistry, deltaOutboxRegistry, normalized).then(() => session2.backend.mutation(api.workspaceFiles.fulfillFileTreeReleaseRequest, {
+  while (true) {
+    const releases = await session2.backend.query(api.workspaceFiles.getPendingFileTreeReleaseRequests, {
       sessionId: session2.sessionId,
-      machineId: session2.machineId,
-      workingDir: normalized
-    })).then(() => {
-      console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree coordinator stopped: ${normalized}`);
-    }).catch((err) => {
-      logSubscriptionWarn(`File tree release failed for ${normalized}`, err);
+      machineId: session2.machineId
     });
+    if (!releases?.length)
+      return;
+    const releasesByDir = new Set;
+    for (const release of releases) {
+      releasesByDir.add(normalizeWorkingDirForLookup(release.workingDir));
+    }
+    let successCount = 0;
+    for (const normalized of releasesByDir) {
+      try {
+        await stopCoordinatorForWorkingDir(coordinators, checkpointOutboxRegistry, deltaOutboxRegistry, normalized);
+        await session2.backend.mutation(api.workspaceFiles.fulfillFileTreeReleaseRequest, {
+          sessionId: session2.sessionId,
+          machineId: session2.machineId,
+          workingDir: normalized
+        });
+        console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree coordinator stopped: ${normalized}`);
+        successCount++;
+      } catch (err) {
+        logSubscriptionWarn(`File tree release failed for ${normalized}`, err);
+      }
+    }
+    if (successCount === 0)
+      return;
   }
 }
 async function processOnePendingFileTreeRequest(session2, coordinators, ensureCoordinator, normalized, force, checkpointOutboxRegistry, deltaOutboxRegistry) {
@@ -117457,6 +117538,25 @@ var init_task_delivery_processor = __esm(() => {
   init_task_delivery_logic();
 });
 
+// src/daemon/infrastructure/agent-operational/ack-machine-operational-signals.ts
+async function ackMachineOperationalSignals(sessionDeps, machineId, throughSignalKey) {
+  while (true) {
+    const result = await sessionDeps.backend.mutation(api.machines.ackMachineOperationalSignals, {
+      sessionId: sessionDeps.sessionId,
+      machineId,
+      throughSignalKey
+    });
+    if (!result.hasMore)
+      return;
+    if (result.deletedCount === 0) {
+      throw new Error("Operational signal ack reported more work without progress");
+    }
+  }
+}
+var init_ack_machine_operational_signals = __esm(() => {
+  init_api3();
+});
+
 // src/daemon/infrastructure/agent-operational/enrich-snapshot-with-operational.ts
 function enrichSnapshotWithOperational(snapshot) {
   const op = getNativeDeliverySession()?.agentOperationalReadModel?.get(snapshot.chatroomId, snapshot.agentConfig.role);
@@ -117477,14 +117577,123 @@ var init_enrich_snapshot_with_operational = __esm(() => {
   init_native_delivery_session_registry();
 });
 
-// src/daemon/infrastructure/agent-operational/subscribe-machine-agent-operational-status.ts
-function subscribeMachineAgentOperationalStatus(client4, options, onRows) {
-  return client4.onUpdate(api.machines.subscribeMachineAgentOperationalStatus, { sessionId: options.sessionId, machineId: options.machineId }, (result) => {
-    if (Array.isArray(result))
-      onRows(result);
+// src/daemon/infrastructure/agent-operational/fetch-machine-agent-operational-status.ts
+async function fetchMachineAgentOperationalStatus(sessionDeps, machineId) {
+  const result = await sessionDeps.backend.query(api.machines.listMachineAgentOperationalStatus, {
+    sessionId: sessionDeps.sessionId,
+    machineId
+  });
+  return result;
+}
+var init_fetch_machine_agent_operational_status = __esm(() => {
+  init_api3();
+});
+
+// src/daemon/infrastructure/agent-operational/operational-inbox.ts
+function operationalSignalCursorAt(timestamp) {
+  return `${String(Math.max(0, Math.floor(timestamp))).padStart(16, "0")}:`;
+}
+function abortError() {
+  const error51 = new Error("Operational inbox stopped");
+  error51.name = "AbortError";
+  return error51;
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted)
+    throw abortError();
+}
+function waitForOperationalSignalPage(options, afterSignalKey) {
+  return new Promise((resolve8, reject) => {
+    let unsubscribe;
+    let settled = false;
+    const cleanup = () => {
+      unsubscribe?.();
+      unsubscribe = undefined;
+      options.signal?.removeEventListener("abort", onAbort);
+    };
+    const settle2 = (fn2) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      fn2();
+    };
+    const onAbort = () => {
+      settle2(() => reject(abortError()));
+    };
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    try {
+      throwIfAborted(options.signal);
+    } catch (error51) {
+      settle2(() => reject(error51));
+      return;
+    }
+    unsubscribe = options.client.onUpdate(api.machines.subscribeMachineOperationalSignalsSince, {
+      sessionId: options.sessionId,
+      machineId: options.machineId,
+      afterKey: afterSignalKey,
+      limit: options.signalPageLimit ?? DEFAULT_SIGNAL_PAGE_LIMIT
+    }, (result) => {
+      if (!result || typeof result !== "object")
+        return;
+      const page = result;
+      const items = page.items;
+      const highKey = page.highKey;
+      if (!items?.length || !highKey)
+        return;
+      settle2(() => resolve8({
+        items,
+        afterSignalKey,
+        highSignalKey: highKey
+      }));
+    }, (error51) => {
+      settle2(() => reject(error51));
+    });
   });
 }
-var init_subscribe_machine_agent_operational_status = __esm(() => {
+async function* createOperationalSignalIterator(options) {
+  let afterSignalKey = options.initialAfterSignalKey ?? operationalSignalCursorAt(options.serviceStartedAt ?? Date.now());
+  while (!options.signal?.aborted) {
+    const page = await waitForOperationalSignalPage(options, afterSignalKey);
+    yield page;
+    afterSignalKey = page.highSignalKey;
+  }
+}
+async function fetchRowsForSignalPage(options, page) {
+  const rows = [];
+  const removed = [];
+  let afterSignalKey = page.afterSignalKey;
+  while (true) {
+    throwIfAborted(options.signal);
+    const result = await options.client.query(api.machines.listOperationalStatusForMachineSignalRange, {
+      sessionId: options.sessionId,
+      machineId: options.machineId,
+      afterSignalKey,
+      throughSignalKey: page.highSignalKey,
+      limit: options.operationalPageLimit ?? DEFAULT_OPERATIONAL_PAGE_LIMIT
+    });
+    rows.push(...result.rows);
+    removed.push(...result.removed);
+    if (!result.hasMore || !result.nextSignalKey)
+      break;
+    afterSignalKey = result.nextSignalKey;
+  }
+  return { rows, removed };
+}
+async function runOperationalInbox(options, onUpdate) {
+  for await (const page of createOperationalSignalIterator(options)) {
+    const hydrated = await fetchRowsForSignalPage(options, page);
+    await onUpdate({
+      signals: page.items,
+      rows: hydrated.rows,
+      removed: hydrated.removed,
+      afterSignalKey: page.afterSignalKey,
+      throughSignalKey: page.highSignalKey
+    });
+  }
+}
+var DEFAULT_SIGNAL_PAGE_LIMIT = 100, DEFAULT_OPERATIONAL_PAGE_LIMIT = 500;
+var init_operational_inbox = __esm(() => {
   init_api3();
 });
 
@@ -117669,14 +117878,14 @@ var init_task_inbox_delivery = __esm(() => {
 function taskSignalCursorAt(timestamp) {
   return `${String(Math.max(0, Math.floor(timestamp))).padStart(16, "0")}:`;
 }
-function abortError() {
+function abortError2() {
   const error51 = new Error("Task inbox stopped");
   error51.name = "AbortError";
   return error51;
 }
-function throwIfAborted(signal) {
+function throwIfAborted2(signal) {
   if (signal?.aborted)
-    throw abortError();
+    throw abortError2();
 }
 function waitForTaskSignalPage(options, afterSignalKey) {
   return new Promise((resolve8, reject) => {
@@ -117695,11 +117904,11 @@ function waitForTaskSignalPage(options, afterSignalKey) {
       fn2();
     };
     const onAbort = () => {
-      settle2(() => reject(abortError()));
+      settle2(() => reject(abortError2()));
     };
     options.signal?.addEventListener("abort", onAbort, { once: true });
     try {
-      throwIfAborted(options.signal);
+      throwIfAborted2(options.signal);
     } catch (error51) {
       settle2(() => reject(error51));
       return;
@@ -117708,7 +117917,7 @@ function waitForTaskSignalPage(options, afterSignalKey) {
       sessionId: options.sessionId,
       machineId: options.machineId,
       afterKey: afterSignalKey,
-      limit: options.signalPageLimit ?? DEFAULT_SIGNAL_PAGE_LIMIT
+      limit: options.signalPageLimit ?? DEFAULT_SIGNAL_PAGE_LIMIT2
     }, (result) => {
       if (!result || typeof result !== "object")
         return;
@@ -117739,7 +117948,7 @@ async function fetchSnapshotsForSignalPage(options, page) {
   const snapshots = [];
   let afterSignalKey = page.afterSignalKey;
   while (true) {
-    throwIfAborted(options.signal);
+    throwIfAborted2(options.signal);
     const result = await options.client.query(api.tasks.listTasksForMachineSignalRange, {
       sessionId: options.sessionId,
       machineId: options.machineId,
@@ -117765,7 +117974,7 @@ async function runTaskInbox(options, onUpdate) {
     });
   }
 }
-var DEFAULT_SIGNAL_PAGE_LIMIT = 100, DEFAULT_TASK_PAGE_LIMIT = 500;
+var DEFAULT_SIGNAL_PAGE_LIMIT2 = 100, DEFAULT_TASK_PAGE_LIMIT = 500;
 var init_task = __esm(() => {
   init_api3();
 });
@@ -117804,11 +118013,28 @@ async function runInboxLoopWithRestart(options, onUpdate, isStopped) {
     }
   }
 }
+async function runOperationalInboxLoopWithRestart(options, onUpdate, isStopped) {
+  let backoffMs = INBOX_RESTART_INITIAL_MS;
+  while (!isStopped()) {
+    try {
+      await runOperationalInbox(options, onUpdate);
+      return;
+    } catch (error51) {
+      if (isStopped() || isAbortError2(error51))
+        return;
+      console.warn(`[OperationalInbox] loop error, restarting in ${backoffMs}ms:`, error51);
+      await new Promise((resolve8) => setTimeout(resolve8, backoffMs));
+      backoffMs = Math.min(backoffMs * 2, INBOX_RESTART_MAX_MS);
+    }
+  }
+}
 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 lifecycleOutboxService = yield* AgentLifecycleOutboxService;
-  const lifecycleOutbox = { enqueue: (fact) => exports_Effect.runPromise(lifecycleOutboxService.enqueue(fact)) };
+  const lifecycleOutbox = {
+    enqueue: (fact) => exports_Effect.runPromise(lifecycleOutboxService.enqueue(fact))
+  };
   const effectContext2 = yield* exports_Effect.context();
   const runtime4 = yield* exports_Effect.runtime();
   const sessionDeps = {
@@ -117827,6 +118053,13 @@ var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_R
     inboxType: "task",
     scopeKey: session2.machineId
   });
+  const persistedOperational = inboxStore.get({
+    inboxType: "operational",
+    scopeKey: session2.machineId
+  });
+  const serviceStartedAt = Date.now();
+  const persistedOperationalKey = persistedOperational?.state.afterSignalKey;
+  const initialOperationalKey = persistedOperationalKey ?? operationalSignalCursorAt(serviceStartedAt);
   const abort = new AbortController;
   let stopped = false;
   const taskSnapshotState = new MachineTaskSnapshotState;
@@ -117848,7 +118081,7 @@ var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_R
     client: wsClient2,
     sessionId: session2.sessionId,
     machineId: session2.machineId,
-    serviceStartedAt: Date.now(),
+    serviceStartedAt,
     initialAfterSignalKey: persisted?.state.afterSignalKey,
     signal: abort.signal
   };
@@ -117869,6 +118102,24 @@ var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_R
       inboxUpdateInFlight = false;
     }
   };
+  const bootstrapSucceeded = yield* exports_Effect.tryPromise(async () => {
+    const rows = await fetchMachineAgentOperationalStatus(sessionDeps, session2.machineId);
+    agentOperationalReadModel.replace(rows);
+    return true;
+  }).pipe(exports_Effect.catchAll((error51) => {
+    console.warn("[OperationalInbox] bootstrap failed:", error51);
+    return exports_Effect.succeed(false);
+  }));
+  if (persistedOperationalKey) {
+    ackMachineOperationalSignals(sessionDeps, session2.machineId, persistedOperationalKey).catch((error51) => console.warn("[OperationalInbox] startup signal cleanup failed:", error51));
+  } else if (bootstrapSucceeded) {
+    try {
+      inboxStore.save({ inboxType: "operational", scopeKey: session2.machineId }, { afterSignalKey: initialOperationalKey });
+      ackMachineOperationalSignals(sessionDeps, session2.machineId, initialOperationalKey).catch((error51) => console.warn("[OperationalInbox] startup signal cleanup failed:", error51));
+    } catch (error51) {
+      console.warn("[OperationalInbox] failed to persist bootstrap baseline:", error51);
+    }
+  }
   yield* exports_Effect.tryPromise(() => bootstrapMachineAssignedTaskSnapshots({
     sessionDeps,
     runtime: runtime4,
@@ -117881,19 +118132,32 @@ var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_R
     console.warn("[TaskInbox] bootstrap failed:", error51);
     return exports_Effect.void;
   }));
-  const unsubscribeOperational = subscribeMachineAgentOperationalStatus(wsClient2, {
+  const operationalInboxOptions = {
+    client: wsClient2,
     sessionId: session2.sessionId,
     machineId: session2.machineId,
+    serviceStartedAt,
+    initialAfterSignalKey: initialOperationalKey,
     signal: abort.signal
-  }, (rows) => {
-    if (stopped)
-      return;
-    const changed = agentOperationalReadModel.replace(rows);
-    const snapshots = changed.flatMap(({ chatroomId, role }) => taskSnapshotState.listForRole(chatroomId, role));
-    if (snapshots.length === 0)
-      return;
-    processTasksUpdate(runtime4, effectContext2, cooldown, agentMgr, sessionDeps, session2.machineId, "operational-status", { snapshots: enrichSnapshotsWithOperational(snapshots) }).catch((error51) => console.warn("[TaskInbox] operational-status reconcile failed:", error51));
-  }) ?? (() => {});
+  };
+  const operationalInboxHandler = async (update6) => {
+    inboxUpdateInFlight = true;
+    try {
+      const changed = agentOperationalReadModel.applySignalPage(update6.rows, update6.removed);
+      const snapshots = changed.flatMap(({ chatroomId, role }) => taskSnapshotState.listForRole(chatroomId, role));
+      if (snapshots.length > 0) {
+        await processTasksUpdate(runtime4, effectContext2, cooldown, agentMgr, sessionDeps, session2.machineId, "operational-status", { snapshots: enrichSnapshotsWithOperational(snapshots) });
+      }
+      inboxStore.save({ inboxType: "operational", scopeKey: session2.machineId }, { afterSignalKey: update6.throughSignalKey });
+      try {
+        await ackMachineOperationalSignals(sessionDeps, session2.machineId, update6.throughSignalKey);
+      } catch (error51) {
+        console.warn("[OperationalInbox] signal cleanup failed:", error51);
+      }
+    } finally {
+      inboxUpdateInFlight = false;
+    }
+  };
   const reconcileTimer = setInterval(() => {
     if (stopped || inboxUpdateInFlight || reconcileInFlight)
       return;
@@ -117905,10 +118169,10 @@ var NATIVE_DELIVERY_RECONCILE_MS = 1e4, INBOX_RESTART_INITIAL_MS = 1000, INBOX_R
     });
   }, NATIVE_DELIVERY_RECONCILE_MS);
   runInboxLoopWithRestart(inboxOptions, inboxHandler, () => stopped);
+  runOperationalInboxLoopWithRestart(operationalInboxOptions, operationalInboxHandler, () => stopped);
   return {
     stop() {
       stopped = true;
-      unsubscribeOperational();
       abort.abort();
       clearInterval(reconcileTimer);
       unregisterNativeDeliverySession();
@@ -117924,8 +118188,10 @@ var init_task_inbox_runtime = __esm(() => {
   init_native_delivery_session_registry();
   init_task_delivery_processor();
   init_task_delivery_logic();
+  init_ack_machine_operational_signals();
   init_enrich_snapshot_with_operational();
-  init_subscribe_machine_agent_operational_status();
+  init_fetch_machine_agent_operational_status();
+  init_operational_inbox();
   init_fetch_machine_assigned_task_snapshots();
   init_inbox();
   init_task_inbox_delivery();
@@ -118428,6 +118694,9 @@ function createDaemonRuntime(deps) {
           break;
       }
     });
+    fileTreeHandle.drainPendingFileTreeReleaseRequests().catch((err) => {
+      console.warn(`[${formatTimestamp()}] ⚠️  Startup file-tree release drain failed: ${getErrorMessage(err)}`);
+    });
     workspaceListSubscriptionHandle = yield* startWorkspaceListSubscriptionEffect();
     registerWorkspaceGitInboundHandler(async (event) => {
       switch (event.type) {
@@ -119155,31 +119424,22 @@ var init_file_content_request = __esm(() => {
 });
 
 // src/daemon/infrastructure/convex/subscribers/file-tree-release-request.ts
-function requestId(req) {
-  if (req._id == null)
-    return "unknown";
-  return typeof req._id === "string" ? req._id : req._id.toString();
-}
-function pendingReleasesSnapshot(requests) {
-  return requests.filter((req) => req != null && typeof req === "object").map((req) => `${requestId(req)}:${req.workingDir ?? ""}:${req.updatedAt ?? 0}`).sort().join("|");
-}
 function startFileTreeReleaseRequestSubscriber(deps, onEvent) {
-  let lastSnapshot = "";
-  const unsub = deps.wsClient.onUpdate(api.workspaceFiles.getPendingFileTreeReleaseRequests, { sessionId: deps.sessionId, machineId: deps.machineId }, (requests) => {
-    if (!requests?.length) {
-      lastSnapshot = "";
+  let lastRevision = null;
+  const maybeWake = (revision, requestId) => {
+    if (lastRevision === revision)
       return;
-    }
-    const snapshot = pendingReleasesSnapshot(requests);
-    if (!snapshot || snapshot === lastSnapshot)
-      return;
-    lastSnapshot = snapshot;
-    const first = requests.find((req) => req != null && typeof req === "object");
-    if (!first)
+    lastRevision = revision;
+    onEvent({ type: "file-tree.release", requestId });
+  };
+  const unsub = deps.wsClient.onUpdate(api.workspaceFiles.subscribeMachineFileTreeReleaseHead, { sessionId: deps.sessionId, machineId: deps.machineId }, (head5) => {
+    if (!head5) {
+      lastRevision = null;
       return;
-    onEvent({ type: "file-tree.release", requestId: requestId(first) });
+    }
+    maybeWake(head5.revision, `rev-${head5.revision}`);
   }, (err) => {
-    console.warn(`[daemon] file-tree-release subscriber error: ${err instanceof Error ? err.message : String(err)}`);
+    console.warn(`[daemon] file-tree-release head subscriber error: ${err instanceof Error ? err.message : String(err)}`);
   });
   return {
     async stop() {
@@ -119192,13 +119452,13 @@ var init_file_tree_release_request = __esm(() => {
 });
 
 // src/daemon/infrastructure/convex/subscribers/file-tree-request.ts
-function requestId2(req) {
+function requestId(req) {
   if (req._id == null)
     return "unknown";
   return typeof req._id === "string" ? req._id : req._id.toString();
 }
 function pendingRequestsSnapshot(requests) {
-  return requests.filter((req) => req != null && typeof req === "object").map((req) => `${requestId2(req)}:${req.workingDir ?? ""}:${req.force ? "1" : "0"}:${req.updatedAt ?? 0}`).sort().join("|");
+  return requests.filter((req) => req != null && typeof req === "object").map((req) => `${requestId(req)}:${req.workingDir ?? ""}:${req.force ? "1" : "0"}:${req.updatedAt ?? 0}`).sort().join("|");
 }
 function startFileTreeRequestSubscriber(deps, onEvent) {
   let lastSnapshot = "";
@@ -119214,7 +119474,7 @@ function startFileTreeRequestSubscriber(deps, onEvent) {
     const first = requests.find((req) => req != null && typeof req === "object");
     if (!first)
       return;
-    onEvent({ type: "file-tree.request", requestId: requestId2(first) });
+    onEvent({ type: "file-tree.request", requestId: requestId(first) });
   }, (err) => {
     console.warn(`[daemon] file-tree-request subscriber error: ${err instanceof Error ? err.message : String(err)}`);
   });
@@ -119251,7 +119511,7 @@ var init_file_write_request = __esm(() => {
 });
 
 // src/daemon/infrastructure/convex/subscribers/git-request.ts
-function requestId3(req) {
+function requestId2(req) {
   return typeof req._id === "string" ? req._id : req._id.toString();
 }
 function startGitRequestSubscriber(deps, onEvent) {
@@ -119262,7 +119522,7 @@ function startGitRequestSubscriber(deps, onEvent) {
     for (const req of requests) {
       if (req == null || typeof req !== "object" || !("_id" in req))
         continue;
-      const id3 = requestId3(req);
+      const id3 = requestId2(req);
       if (seen.has(id3))
         continue;
       seen.add(id3);
@@ -132104,19 +132364,19 @@ var require_cluster_adapter = __commonJS((exports) => {
     }
     onResponse(response) {
       var _a4, _b2;
-      const requestId4 = response.data.requestId;
-      debug13("[%s] received response %s to request %s", this.uid, response.type, requestId4);
+      const requestId3 = response.data.requestId;
+      debug13("[%s] received response %s to request %s", this.uid, response.type, requestId3);
       switch (response.type) {
         case MessageType.BROADCAST_CLIENT_COUNT: {
-          (_a4 = this.ackRequests.get(requestId4)) === null || _a4 === undefined || _a4.clientCountCallback(response.data.clientCount);
+          (_a4 = this.ackRequests.get(requestId3)) === null || _a4 === undefined || _a4.clientCountCallback(response.data.clientCount);
           break;
         }
         case MessageType.BROADCAST_ACK: {
-          (_b2 = this.ackRequests.get(requestId4)) === null || _b2 === undefined || _b2.ack(response.data.packet);
+          (_b2 = this.ackRequests.get(requestId3)) === null || _b2 === undefined || _b2.ack(response.data.packet);
           break;
         }
         case MessageType.FETCH_SOCKETS_RESPONSE: {
-          const request2 = this.requests.get(requestId4);
+          const request2 = this.requests.get(requestId3);
           if (!request2) {
             return;
           }
@@ -132125,12 +132385,12 @@ var require_cluster_adapter = __commonJS((exports) => {
           if (request2.current === request2.expected) {
             clearTimeout(request2.timeout);
             request2.resolve(request2.responses);
-            this.requests.delete(requestId4);
+            this.requests.delete(requestId3);
           }
           break;
         }
         case MessageType.SERVER_SIDE_EMIT_RESPONSE: {
-          const request2 = this.requests.get(requestId4);
+          const request2 = this.requests.get(requestId3);
           if (!request2) {
             return;
           }
@@ -132139,7 +132399,7 @@ var require_cluster_adapter = __commonJS((exports) => {
           if (request2.current === request2.expected) {
             clearTimeout(request2.timeout);
             request2.resolve(null, request2.responses);
-            this.requests.delete(requestId4);
+            this.requests.delete(requestId3);
           }
           break;
         }
@@ -132182,8 +132442,8 @@ var require_cluster_adapter = __commonJS((exports) => {
       var _a4;
       const onlyLocal = (_a4 = opts === null || opts === undefined ? undefined : opts.flags) === null || _a4 === undefined ? undefined : _a4.local;
       if (!onlyLocal) {
-        const requestId4 = randomId();
-        this.ackRequests.set(requestId4, {
+        const requestId3 = randomId();
+        this.ackRequests.set(requestId3, {
           clientCountCallback,
           ack
         });
@@ -132191,12 +132451,12 @@ var require_cluster_adapter = __commonJS((exports) => {
           type: MessageType.BROADCAST,
           data: {
             packet,
-            requestId: requestId4,
+            requestId: requestId3,
             opts: encodeOptions(opts)
           }
         });
         setTimeout(() => {
-          this.ackRequests.delete(requestId4);
+          this.ackRequests.delete(requestId3);
         }, opts.flags.timeout);
       }
       super.broadcastWithAck(packet, opts, clientCountCallback, ack);
@@ -132265,13 +132525,13 @@ var require_cluster_adapter = __commonJS((exports) => {
       if (((_a4 = opts.flags) === null || _a4 === undefined ? undefined : _a4.local) || expectedResponseCount <= 0) {
         return localSockets;
       }
-      const requestId4 = randomId();
+      const requestId3 = randomId();
       return new Promise((resolve8, reject) => {
         const timeout3 = setTimeout(() => {
-          const storedRequest2 = this.requests.get(requestId4);
+          const storedRequest2 = this.requests.get(requestId3);
           if (storedRequest2) {
             reject(new Error(`timeout reached: only ${storedRequest2.current} responses received out of ${storedRequest2.expected}`));
-            this.requests.delete(requestId4);
+            this.requests.delete(requestId3);
           }
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
@@ -132282,12 +132542,12 @@ var require_cluster_adapter = __commonJS((exports) => {
           expected: expectedResponseCount,
           responses: localSockets
         };
-        this.requests.set(requestId4, storedRequest);
+        this.requests.set(requestId3, storedRequest);
         this.publish({
           type: MessageType.FETCH_SOCKETS,
           data: {
             opts: encodeOptions(opts),
-            requestId: requestId4
+            requestId: requestId3
           }
         });
       });
@@ -132308,12 +132568,12 @@ var require_cluster_adapter = __commonJS((exports) => {
       if (expectedResponseCount <= 0) {
         return ack(null, []);
       }
-      const requestId4 = randomId();
+      const requestId3 = randomId();
       const timeout3 = setTimeout(() => {
-        const storedRequest2 = this.requests.get(requestId4);
+        const storedRequest2 = this.requests.get(requestId3);
         if (storedRequest2) {
           ack(new Error(`timeout reached: only ${storedRequest2.current} responses received out of ${storedRequest2.expected}`), storedRequest2.responses);
-          this.requests.delete(requestId4);
+          this.requests.delete(requestId3);
         }
       }, DEFAULT_TIMEOUT);
       const storedRequest = {
@@ -132324,11 +132584,11 @@ var require_cluster_adapter = __commonJS((exports) => {
         expected: expectedResponseCount,
         responses: []
       };
-      this.requests.set(requestId4, storedRequest);
+      this.requests.set(requestId3, storedRequest);
       this.publish({
         type: MessageType.SERVER_SIDE_EMIT,
         data: {
-          requestId: requestId4,
+          requestId: requestId3,
           packet
         }
       });
@@ -132445,12 +132705,12 @@ var require_cluster_adapter = __commonJS((exports) => {
       if (expectedResponseCount <= 0) {
         return ack(null, []);
       }
-      const requestId4 = randomId();
+      const requestId3 = randomId();
       const timeout3 = setTimeout(() => {
-        const storedRequest2 = this.customRequests.get(requestId4);
+        const storedRequest2 = this.customRequests.get(requestId3);
         if (storedRequest2) {
           ack(new Error(`timeout reached: missing ${storedRequest2.missingUids.size} responses`), storedRequest2.responses);
-          this.customRequests.delete(requestId4);
+          this.customRequests.delete(requestId3);
         }
       }, DEFAULT_TIMEOUT);
       const storedRequest = {
@@ -132460,11 +132720,11 @@ var require_cluster_adapter = __commonJS((exports) => {
         missingUids: new Set([...this.nodesMap.keys()]),
         responses: []
       };
-      this.customRequests.set(requestId4, storedRequest);
+      this.customRequests.set(requestId3, storedRequest);
       this.publish({
         type: MessageType.SERVER_SIDE_EMIT,
         data: {
-          requestId: requestId4,
+          requestId: requestId3,
           packet
         }
       });
@@ -132485,13 +132745,13 @@ var require_cluster_adapter = __commonJS((exports) => {
       if (((_a4 = opts.flags) === null || _a4 === undefined ? undefined : _a4.local) || expectedResponseCount <= 0) {
         return localSockets;
       }
-      const requestId4 = randomId();
+      const requestId3 = randomId();
       return new Promise((resolve8, reject) => {
         const timeout3 = setTimeout(() => {
-          const storedRequest2 = this.customRequests.get(requestId4);
+          const storedRequest2 = this.customRequests.get(requestId3);
           if (storedRequest2) {
             reject(new Error(`timeout reached: missing ${storedRequest2.missingUids.size} responses`));
-            this.customRequests.delete(requestId4);
+            this.customRequests.delete(requestId3);
           }
         }, opts.flags.timeout || DEFAULT_TIMEOUT);
         const storedRequest = {
@@ -132501,22 +132761,22 @@ var require_cluster_adapter = __commonJS((exports) => {
           missingUids: new Set([...this.nodesMap.keys()]),
           responses: localSockets
         };
-        this.customRequests.set(requestId4, storedRequest);
+        this.customRequests.set(requestId3, storedRequest);
         this.publish({
           type: MessageType.FETCH_SOCKETS,
           data: {
             opts: encodeOptions(opts),
-            requestId: requestId4
+            requestId: requestId3
           }
         });
       });
     }
     onResponse(response) {
-      const requestId4 = response.data.requestId;
-      debug13("[%s] received response %s to request %s", this.uid, response.type, requestId4);
+      const requestId3 = response.data.requestId;
+      debug13("[%s] received response %s to request %s", this.uid, response.type, requestId3);
       switch (response.type) {
         case MessageType.FETCH_SOCKETS_RESPONSE: {
-          const request2 = this.customRequests.get(requestId4);
+          const request2 = this.customRequests.get(requestId3);
           if (!request2) {
             return;
           }
@@ -132525,12 +132785,12 @@ var require_cluster_adapter = __commonJS((exports) => {
           if (request2.missingUids.size === 0) {
             clearTimeout(request2.timeout);
             request2.resolve(request2.responses);
-            this.customRequests.delete(requestId4);
+            this.customRequests.delete(requestId3);
           }
           break;
         }
         case MessageType.SERVER_SIDE_EMIT_RESPONSE: {
-          const request2 = this.customRequests.get(requestId4);
+          const request2 = this.customRequests.get(requestId3);
           if (!request2) {
             return;
           }
@@ -132539,7 +132799,7 @@ var require_cluster_adapter = __commonJS((exports) => {
           if (request2.missingUids.size === 0) {
             clearTimeout(request2.timeout);
             request2.resolve(null, request2.responses);
-            this.customRequests.delete(requestId4);
+            this.customRequests.delete(requestId3);
           }
           break;
         }
@@ -132548,7 +132808,7 @@ var require_cluster_adapter = __commonJS((exports) => {
       }
     }
     removeNode(uid) {
-      this.customRequests.forEach((request2, requestId4) => {
+      this.customRequests.forEach((request2, requestId3) => {
         request2.missingUids.delete(uid);
         if (request2.missingUids.size === 0) {
           clearTimeout(request2.timeout);
@@ -132557,7 +132817,7 @@ var require_cluster_adapter = __commonJS((exports) => {
           } else if (request2.type === MessageType.SERVER_SIDE_EMIT) {
             request2.resolve(null, request2.responses);
           }
-          this.customRequests.delete(requestId4);
+          this.customRequests.delete(requestId3);
         }
       });
       this.nodesMap.delete(uid);
@@ -135131,4 +135391,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=56DD8E367644E33A64756E2164756E21
+//# debugId=540831143AEEA0CF64756E2164756E21