chatroom-cli 1.77.5 → 1.78.1

package/dist/index.js

@@ -99284,6 +99284,30 @@ var init_assigned_task_snapshot_store = __esm(() => {
   rows = [];
 });
 
+// src/commands/machine/daemon-start/restart-orchestrator-in-flight.ts
+function roleKey2(chatroomId, role) {
+  return `${chatroomId}:${role.toLowerCase()}`;
+}
+function markRestartOrchestratorInFlight(chatroomId, role, correlationId) {
+  inFlight.set(roleKey2(chatroomId, role), correlationId);
+}
+function clearRestartOrchestratorInFlight(chatroomId, role, correlationId) {
+  const key = roleKey2(chatroomId, role);
+  if (correlationId !== undefined && inFlight.get(key) !== correlationId)
+    return;
+  inFlight.delete(key);
+}
+function isRestartOrchestratorInFlight(chatroomId, role) {
+  return inFlight.has(roleKey2(chatroomId, role));
+}
+function filterSnapshotsExcludingRestartInFlight(snapshots) {
+  return snapshots.filter((row) => !isRestartOrchestratorInFlight(row.chatroomId, row.agentConfig.role));
+}
+var inFlight;
+var init_restart_orchestrator_in_flight = __esm(() => {
+  inFlight = new Map;
+});
+
 // src/commands/machine/daemon-start/native-task-delivery-coordinator.ts
 class NativeTaskDeliveryCoordinator {
   onSessionLost(params) {
@@ -99296,6 +99320,8 @@ class NativeTaskDeliveryCoordinator {
     getRoleDeliveryState().resetDeliveryState(chatroomId, role);
   }
   tryInjectNextForRole(chatroomId, role) {
+    if (isRestartOrchestratorInFlight(chatroomId, role))
+      return;
     const session2 = getNativeDeliverySession();
     if (!session2)
       return;
@@ -99315,7 +99341,10 @@ class NativeTaskDeliveryCoordinator {
     });
   }
   reconcileAssignedTasks(params) {
-    const { tasks, runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = params;
+    const tasks = filterSnapshotsExcludingRestartInFlight(params.tasks);
+    if (tasks.length === 0)
+      return;
+    const { runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = params;
     const deliveryState = getRoleDeliveryState();
     const ledger = getNativeDeliveryLedger();
     const pendingFirst = [...tasks].sort((a, b) => {
@@ -99404,6 +99433,8 @@ function resetRoleDeliveryState(chatroomId, role) {
   getRoleDeliveryState().resetDeliveryState(chatroomId, role);
 }
 function notifyNativeTurnIdle(params) {
+  if (isRestartOrchestratorInFlight(params.chatroomId, params.role))
+    return;
   logNativeDeliveryPrimary(params.role, params.chatroomId);
   getNativeTaskDeliveryCoordinator().tryInjectNextForRole(params.chatroomId, params.role);
 }
@@ -99416,6 +99447,7 @@ var init_native_task_delivery_coordinator = __esm(() => {
   init_api3();
   init_assigned_task_snapshot_store();
   init_convex_error();
+  init_restart_orchestrator_in_flight();
 });
 
 // src/commands/machine/daemon-start/restart-orchestrator.ts
@@ -99438,14 +99470,6 @@ async function waitForHarnessSessionId(deps, event, pid) {
   if (initial?.harnessSessionId) {
     return initial.harnessSessionId;
   }
-  await deps.session.backend.mutation(api.machines.emitHarnessSessionAwaiting, {
-    sessionId: deps.session.sessionId,
-    machineId: deps.session.machineId,
-    chatroomId: event.chatroomId,
-    role: event.role,
-    pid,
-    timeoutMs: HARNESS_SESSION_READY_TIMEOUT_MS
-  });
   const deadline = Date.now() + HARNESS_SESSION_READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
     const slot = deps.agentMgr.getSlot(event.chatroomId, event.role);
@@ -99454,14 +99478,6 @@ async function waitForHarnessSessionId(deps, event, pid) {
     }
     await sleep5(100);
   }
-  await deps.session.backend.mutation(api.machines.emitHarnessSessionTimeout, {
-    sessionId: deps.session.sessionId,
-    machineId: deps.session.machineId,
-    chatroomId: event.chatroomId,
-    role: event.role,
-    pid,
-    timeoutMs: HARNESS_SESSION_READY_TIMEOUT_MS
-  });
   await deps.agentMgr.stop({
     chatroomId: event.chatroomId,
     role: event.role,
@@ -99556,15 +99572,14 @@ async function deliverPendingTasks(deps, event) {
 }
 async function runRestartOrchestrator(deps, event) {
   const { chatroomId, role } = event;
+  markRestartOrchestratorInFlight(chatroomId, role, event.correlationId);
   try {
-    await emitPhase(deps, event, "reset");
     resetRoleDeliveryState(chatroomId, role);
     await deps.agentMgr.stop({
       chatroomId,
       role,
       reason: "user.restart"
     });
-    await emitPhase(deps, event, "spawn");
     const spawnResult = await exports_Effect.runPromise(deps.agentMgr.ensureRunning({
       chatroomId,
       role,
@@ -99578,23 +99593,12 @@ async function runRestartOrchestrator(deps, event) {
       await emitPhase(deps, event, "failed", spawnResult.error ?? "spawn failed");
       return;
     }
-    await emitPhase(deps, event, "await_session");
     const harnessSessionId = await waitForHarnessSessionId(deps, event, spawnResult.pid);
     if (!harnessSessionId) {
       await emitPhase(deps, event, "failed", "harnessSessionId timeout");
       return;
     }
-    await deps.session.backend.mutation(api.machines.emitHarnessSessionReady, {
-      sessionId: deps.session.sessionId,
-      machineId: deps.session.machineId,
-      chatroomId,
-      role,
-      harnessSessionId,
-      pid: spawnResult.pid
-    });
     await forceNativeWaiting(deps, event);
-    await emitPhase(deps, event, "ready");
-    await emitPhase(deps, event, "deliver");
     const deliveredTaskIds = await deliverPendingTasks(deps, event);
     await deps.session.backend.mutation(api.machines.emitRestartCompleted, {
       sessionId: deps.session.sessionId,
@@ -99604,10 +99608,11 @@ async function runRestartOrchestrator(deps, event) {
       correlationId: event.correlationId,
       deliveredTaskIds
     });
-    await emitPhase(deps, event, "completed");
   } catch (err) {
     console.warn(`[RestartOrchestrator] failed for ${role}@${chatroomId}: ${getErrorMessage(err)}`);
     await emitPhase(deps, event, "failed", getErrorMessage(err));
+  } finally {
+    clearRestartOrchestratorInFlight(chatroomId, role, event.correlationId);
   }
 }
 var init_restart_orchestrator = __esm(() => {
@@ -99621,6 +99626,7 @@ var init_restart_orchestrator = __esm(() => {
   init_native_task_injector();
   init_api3();
   init_convex_error();
+  init_restart_orchestrator_in_flight();
 });
 
 // src/events/daemon/agent/on-request-restart-agent.ts
@@ -100742,6 +100748,17 @@ async function openFinder(workingDir) {
   execFireAndForget(`${cmd} ${escapeShellArg(workingDir)}`, "open-finder");
   return { success: true };
 }
+async function openCursor(workingDir) {
+  const available = await isCliAvailable("cursor");
+  if (!available) {
+    return {
+      success: false,
+      error: "Cursor CLI (cursor) not found. Install via: Cursor → Cmd+Shift+P → 'Shell Command: Install cursor in PATH'"
+    };
+  }
+  execFireAndForget(`cursor ${escapeShellArg(workingDir)}`, "open-cursor");
+  return { success: true };
+}
 async function openGithubDesktop(workingDir) {
   const available = await isCliAvailable("github");
   if (!available) {
@@ -100816,6 +100833,7 @@ var init_execute_local_action = __esm(() => {
   actionHandlers = {
     "open-vscode": openVscode,
     "open-finder": openFinder,
+    "open-cursor": openCursor,
     "open-github-desktop": openGithubDesktop,
     "git-discard-file": gitDiscardFileAction,
     "git-discard-all": gitDiscardAllAction,
@@ -103236,7 +103254,7 @@ var init_open_pending_session = __esm(() => {
 
 // src/commands/machine/daemon-start/direct-harness/session-subscriber.ts
 function startSessionSubscriber(daemonSession, wsClient2, deps) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.directHarness.sessions.listPendingSessionsForMachine, {
     sessionId: daemonSession.sessionId,
     machineId: daemonSession.machineId
@@ -103245,9 +103263,9 @@ function startSessionSubscriber(daemonSession, wsClient2, deps) {
       return;
     for (const session2 of pendingSessions) {
       const rowId = session2._id;
-      if (inFlight.has(rowId))
+      if (inFlight2.has(rowId))
         continue;
-      inFlight.add(rowId);
+      inFlight2.add(rowId);
       (async () => {
         const harnessName = session2.opencode?.harnessName ?? "opencode-sdk";
         const agent = session2.opencode?.lastUsedConfig?.agent ?? "build";
@@ -103258,7 +103276,7 @@ function startSessionSubscriber(daemonSession, wsClient2, deps) {
           harnessName,
           lastUsedConfig: { agent, ...model ? { model } : {} }
         }, { logPrefix: "[direct-harness]", handleProviderIdEvents: true });
-      })().finally(() => inFlight.delete(rowId));
+      })().finally(() => inFlight2.delete(rowId));
     }
   }, (err) => {
     console.warn("[direct-harness] Session subscription error:", err instanceof Error ? err.message : String(err));
@@ -103793,21 +103811,21 @@ var init_prompt_subscriber2 = __esm(() => {
 
 // src/commands/machine/daemon-start/agentic-query/session-subscriber.ts
 function startSessionSubscriber2(daemonSession, wsClient2, deps) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.agenticQuery.runs.pendingForMachine, { sessionId: daemonSession.sessionId, machineId: daemonSession.machineId }, (pendingSessions) => {
     if (!pendingSessions || pendingSessions.length === 0)
       return;
     for (const session2 of pendingSessions) {
       const rowId = session2.runId;
-      if (inFlight.has(rowId))
+      if (inFlight2.has(rowId))
         continue;
-      inFlight.add(rowId);
+      inFlight2.add(rowId);
       openPendingHarnessSession(daemonSession, deps, {
         rowId: session2.runId,
         workspaceId: session2.workspaceId,
         harnessName: session2.harnessName,
         lastUsedConfig: session2.lastUsedConfig
-      }, { logPrefix: "[agentic-query]", handleProviderIdEvents: false }).finally(() => inFlight.delete(rowId));
+      }, { logPrefix: "[agentic-query]", handleProviderIdEvents: false }).finally(() => inFlight2.delete(rowId));
     }
   }, (err) => {
     console.warn("[agentic-query] Session subscription error:", err instanceof Error ? err.message : String(err));
@@ -104100,12 +104118,12 @@ var init_wait_for_enhancer_job = __esm(() => {
 
 // src/commands/machine/daemon-start/enhancer/job-subscriber.ts
 function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, wsClient2, agentServices) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.enhancer.index.pendingForMachine, { sessionId, machineId }, (jobs) => {
     for (const job of jobs ?? []) {
-      if (inFlight.has(job.jobId))
+      if (inFlight2.has(job.jobId))
         continue;
-      inFlight.add(job.jobId);
+      inFlight2.add(job.jobId);
       (async () => {
         let claimed = false;
         let chatroomId = job.chatroomId;
@@ -104193,7 +104211,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             });
           }
         } finally {
-          inFlight.delete(job.jobId);
+          inFlight2.delete(job.jobId);
           if (spawnResult && service3) {
             try {
               await service3.stop(spawnResult.pid);
@@ -114513,6 +114531,8 @@ async function nudgeStuckTasks(tasks, now, cooldown, runtime4, effectContext2, a
 }
 async function reviveNativeTasks(tasks, localHealth, now, cooldown, runtime4, effectContext2, agentMgr, sessionDeps, machineId) {
   for (const row of listNativeTasksNeedingRevive(tasks, localHealth, now, cooldown)) {
+    if (isRestartOrchestratorInFlight(row.chatroomId, row.agentConfig.role))
+      continue;
     await clearStuckStoppingSlotIfNeeded(agentMgr, row.chatroomId, row.agentConfig.role);
     const full = await fetchTaskForAction(sessionDeps, machineId, row);
     if (!full)
@@ -114521,6 +114541,7 @@ async function reviveNativeTasks(tasks, localHealth, now, cooldown, runtime4, ef
   }
 }
 async function processTasksUpdate(tasks, runtime4, effectContext2, cooldown, agentMgr, sessionDeps, machineId, _pass) {
+  tasks = filterSnapshotsExcludingRestartInFlight(tasks);
   if (tasks.length === 0)
     return;
   const now = Date.now();
@@ -114557,7 +114578,7 @@ function runLocalStoreReconcilePass(params) {
   const { stopped, monitorPassInFlight, agentMgr, runtime: runtime4, effectContext: effectContext2, sessionDeps, machineId } = params;
   if (stopped || monitorPassInFlight)
     return;
-  const deliverable = listDeliverablePendingFromStore(agentMgr);
+  const deliverable = filterSnapshotsExcludingRestartInFlight(listDeliverablePendingFromStore(agentMgr));
   if (deliverable.length === 0)
     return;
   const first = deliverable[0];
@@ -114700,6 +114721,7 @@ var init_task_monitor = __esm(() => {
   init_esm();
   init_daemon_services();
   init_native_ready_invariant();
+  init_restart_orchestrator_in_flight();
   init_native_task_delivery_coordinator();
   init_native_task_injector_logic();
   init_task_monitor_logic();
@@ -116359,4 +116381,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=139534CD91C868F464756E2164756E21
+//# debugId=F542CAE8E215492E64756E2164756E21