chatroom-cli 1.116.0 → 1.116.2

package/dist/client/build/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Chatroom Daemon</title>
-    <script type="module" crossorigin src="/assets/index-CGSmO7lb.js"></script>
+    <script type="module" crossorigin src="/assets/index-BRHC2Xs-.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-iM2TK7kh.css">
   </head>
   <body>

package/dist/index.js

@@ -94301,37 +94301,6 @@ var init_git_heartbeat = __esm(() => {
   });
 });
 
-// src/daemon/entry/workspace-git/workspace-list-subscription.ts
-function toSyncWorkspaces(workingDirs) {
-  return workingDirs.map((workingDir) => ({ workingDir }));
-}
-async function reconcileWorkspaceList(session2) {
-  const workspaces = await session2.backend.query(api.workspaces.listRecentlyObservedWorkspacesForMachine, {
-    sessionId: session2.sessionId,
-    machineId: session2.machineId
-  });
-  if (!session2.workspaceListStore) {
-    session2.workspaceListStore = { workspaces: [], updatedAt: 0 };
-  }
-  session2.workspaceListStore.workspaces = toSyncWorkspaces(workspaces);
-  session2.workspaceListStore.updatedAt = Date.now();
-}
-var startWorkspaceListSubscriptionEffect = () => exports_Effect.gen(function* () {
-  const session2 = yield* DaemonSessionService;
-  session2.workspaceListStore = { workspaces: [], updatedAt: 0 };
-  yield* exports_Effect.promise(() => reconcileWorkspaceList(session2));
-  return {
-    stop: () => {
-      session2.workspaceListStore = undefined;
-    }
-  };
-});
-var init_workspace_list_subscription = __esm(() => {
-  init_esm();
-  init_api3();
-  init_daemon_services();
-});
-
 // src/daemon/entry/command-event-types.ts
 function isDaemonCommandEventType(value) {
   return DAEMON_COMMAND_EVENT_TYPES.includes(value);
@@ -94343,7 +94312,6 @@ var init_command_event_types = __esm(() => {
     "agent.restart",
     "daemon.ping",
     "daemon.gitRefresh",
-    "daemon.workspaceListChanged",
     "daemon.localAction",
     "daemon.pickFolder",
     "daemon.refreshCapabilities"
@@ -96472,8 +96440,6 @@ function evictStaleDedupEntries(tracker) {
   evictStaleEntries(tracker.capabilitiesRefreshIds, evictBefore);
   evictStaleEntries(tracker.localActionIds, evictBefore);
   evictStaleEntries(tracker.pickFolderIds, evictBefore);
-  if (tracker.workspaceListChangedIds)
-    evictStaleEntries(tracker.workspaceListChangedIds, evictBefore);
   processManager.evictStalePendingStops();
 }
 function createDedupTracker() {
@@ -96483,21 +96449,9 @@ function createDedupTracker() {
     gitRefreshIds: new Map,
     capabilitiesRefreshIds: new Map,
     localActionIds: new Map,
-    pickFolderIds: new Map,
-    workspaceListChangedIds: new Map
+    pickFolderIds: new Map
   };
 }
-function handleWorkspaceListChangedCommandEffect(event, tracker) {
-  return exports_Effect.gen(function* () {
-    const eventId = String(event._id);
-    if (tracker.workspaceListChangedIds?.has(eventId))
-      return;
-    const session2 = yield* DaemonSessionService;
-    yield* exports_Effect.promise(() => reconcileWorkspaceList(session2));
-    yield* pushGitStateEffect;
-    (tracker.workspaceListChangedIds ??= new Map).set(eventId, Date.now());
-  });
-}
 function handleRequestStartEffect(event, tracker) {
   return exports_Effect.gen(function* () {
     const eventId = event._id.toString();
@@ -96626,27 +96580,11 @@ function handleRefreshCapabilitiesEffect(event, tracker) {
     })));
   });
 }
-async function handleInboundCommandEvent(commandId, tracker, effectContext2, session2, claimedCommand, nativeDelivery) {
+async function handleInboundCommandEvent(commandId, tracker, effectContext2, claimedCommand, nativeDelivery) {
   if (claimedCommand.commandId !== commandId)
     return;
-  const renewTimer = setInterval(() => {
-    session2.backend.mutation(api.daemon.machineCommandInbox.renewClaim, {
-      sessionId: session2.sessionId,
-      commandId: claimedCommand.commandId
-    }).catch(() => {
-      return;
-    });
-  }, MACHINE_COMMAND_LEASE_RENEWAL_INTERVAL_MS);
-  try {
-    const { commandId: _id, machineId, deadline, timestamp, ...rest } = claimedCommand;
-    await exports_Effect.runPromise(dispatchCommandEventEffect({ _id, machineId, deadline, timestamp, ...rest }, tracker, nativeDelivery).pipe(exports_Effect.provide(effectContext2)));
-    await session2.backend.mutation(api.daemon.machineCommandInbox.acknowledge, {
-      sessionId: session2.sessionId,
-      commandId: claimedCommand.commandId
-    });
-  } finally {
-    clearInterval(renewTimer);
-  }
+  const { commandId: _id, machineId, deadline, timestamp, ...rest } = claimedCommand;
+  await exports_Effect.runPromise(dispatchCommandEventEffect({ _id, machineId, deadline, timestamp, ...rest }, tracker, nativeDelivery).pipe(exports_Effect.provide(effectContext2)));
 }
 var GIT_PUSH_ACTIONS, commandEventHandlers, dispatchCommandEventEffect = (event, tracker, nativeDelivery) => {
   if (!isDaemonCommandEventType(event.type))
@@ -96658,7 +96596,6 @@ var init_command_dispatch = __esm(() => {
   init_reliability();
   init_esm();
   init_git_heartbeat();
-  init_workspace_list_subscription();
   init_api3();
   init_capabilities_bridge();
   init_command_event_types();
@@ -96678,7 +96615,6 @@ var init_command_dispatch = __esm(() => {
     "agent.restart": handleRequestRestartEffect,
     "daemon.ping": handlePingCommandEffect,
     "daemon.gitRefresh": handleGitRefreshCommandEffect,
-    "daemon.workspaceListChanged": handleWorkspaceListChangedCommandEffect,
     "daemon.localAction": handleLocalActionCommandEffect,
     "daemon.pickFolder": handlePickFolderCommandEffect,
     "daemon.refreshCapabilities": handleRefreshCapabilitiesEffect
@@ -103294,6 +103230,37 @@ var init_git_subscription = __esm(() => {
   init_daemon_services();
 });
 
+// src/daemon/entry/workspace-git/workspace-list-subscription.ts
+function toSyncWorkspaces(workingDirs) {
+  return workingDirs.map((workingDir) => ({ workingDir }));
+}
+async function reconcileWorkspaceList(session2) {
+  const workspaces = await session2.backend.query(api.workspaces.listRecentlyObservedWorkspacesForMachine, {
+    sessionId: session2.sessionId,
+    machineId: session2.machineId
+  });
+  if (!session2.workspaceListStore) {
+    session2.workspaceListStore = { workspaces: [], updatedAt: 0 };
+  }
+  session2.workspaceListStore.workspaces = toSyncWorkspaces(workspaces);
+  session2.workspaceListStore.updatedAt = Date.now();
+}
+var startWorkspaceListSubscriptionEffect = () => exports_Effect.gen(function* () {
+  const session2 = yield* DaemonSessionService;
+  session2.workspaceListStore = { workspaces: [], updatedAt: 0 };
+  yield* exports_Effect.promise(() => reconcileWorkspaceList(session2));
+  return {
+    stop: () => {
+      session2.workspaceListStore = undefined;
+    }
+  };
+});
+var init_workspace_list_subscription = __esm(() => {
+  init_esm();
+  init_api3();
+  init_daemon_services();
+});
+
 // src/daemon/entry/workspace-git-inbound-registry.ts
 function registerWorkspaceGitInboundHandler(h) {
   handler5 = h;
@@ -103515,7 +103482,7 @@ Listening for commands...`);
           console.warn("[Daemon] command received before task inbox started");
           return;
         }
-        await handleInboundCommandEvent(event.commandId, dedupTracker, effectContext2, session2, event.claimedCommand, nativeDelivery);
+        await handleInboundCommandEvent(event.commandId, dedupTracker, effectContext2, event.claimedCommand, nativeDelivery);
       } else {
         await drainActionableCommandRuns(session2, commandRunRuntime);
       }
@@ -104069,12 +104036,6 @@ async function routeInboundEvent(deps, event) {
 }
 var init_event_router = () => {};
 
-// src/daemon/entry/workspace-membership-refresh-registry.ts
-async function refreshWorkspaceMembership() {
-  await refreshRoomMembership?.();
-}
-var refreshRoomMembership = null;
-
 // src/daemon/infrastructure/convex/subscribers/agentic-query-prompt.ts
 function startAgenticQueryPromptSubscriber(deps, onEvent) {
   let processing = false;
@@ -104477,10 +104438,52 @@ var init_git_request = __esm(() => {
 });
 
 // src/daemon/infrastructure/convex/subscribers/machine-command-inbox.ts
+function getMachineCommandConcurrencyKey(command) {
+  return "workingDir" in command && typeof command.workingDir === "string" ? `workspace:${command.workingDir}` : MACHINE_COMMAND_KEY;
+}
 function startMachineCommandInboxSubscriber(deps, onClaimed) {
   let draining = false;
   let queued = false;
   let stopped = false;
+  let machineTail = Promise.resolve();
+  const workspaceTails = new Map;
+  const enqueueClaimed = (claimed) => {
+    const key = getMachineCommandConcurrencyKey(claimed);
+    const previousMachine = machineTail;
+    const previousWorkspace = workspaceTails.get(key) ?? Promise.resolve();
+    const previous = key === MACHINE_COMMAND_KEY ? Promise.all([previousMachine, ...workspaceTails.values()]) : Promise.all([previousMachine, previousWorkspace]);
+    const renewTimer = setInterval(() => {
+      deps.wsClient.mutation(api.daemon.machineCommandInbox.renewClaim, {
+        sessionId: deps.sessionId,
+        commandId: claimed.commandId
+      }).catch(() => {
+        return;
+      });
+    }, MACHINE_COMMAND_LEASE_RENEWAL_INTERVAL_MS);
+    const task = previous.then(async () => {
+      try {
+        await onClaimed(claimed);
+        await deps.wsClient.mutation(api.daemon.machineCommandInbox.acknowledge, {
+          sessionId: deps.sessionId,
+          commandId: claimed.commandId
+        });
+      } finally {
+        clearInterval(renewTimer);
+      }
+    }).catch((error) => {
+      clearInterval(renewTimer);
+      console.warn(`[daemon] machine command ${claimed.commandId} failed: ${String(error)}`);
+    });
+    if (key === MACHINE_COMMAND_KEY)
+      machineTail = task;
+    else
+      workspaceTails.set(key, task);
+    task.finally(() => {
+      if (key !== MACHINE_COMMAND_KEY && workspaceTails.get(key) === task) {
+        workspaceTails.delete(key);
+      }
+    });
+  };
   const args2 = { sessionId: deps.sessionId, machineId: deps.machineId };
   const drain = async () => {
     if (stopped || draining) {
@@ -104493,7 +104496,7 @@ function startMachineCommandInboxSubscriber(deps, onClaimed) {
         queued = false;
         let claimed;
         while (claimed = await deps.wsClient.mutation(api.daemon.machineCommandInbox.claimNext, args2))
-          await onClaimed(claimed);
+          enqueueClaimed(claimed);
       } while (queued && !stopped);
     } finally {
       draining = false;
@@ -104511,7 +104514,9 @@ function startMachineCommandInboxSubscriber(deps, onClaimed) {
     }
   };
 }
+var MACHINE_COMMAND_KEY = "__machine__";
 var init_machine_command_inbox = __esm(() => {
+  init_reliability();
   init_api3();
 });
 
@@ -104527,11 +104532,6 @@ function startAllSubscribers(deps) {
       await deps.onAgentStopCommand?.(claimed);
       return;
     }
-    if (claimed.type === "daemon.workspaceListChanged") {
-      enhancerJob.refreshChatrooms();
-      gitRequest.refreshWorkspaces();
-      refreshWorkspaceMembership();
-    }
     await dispatchCommandInboundEvent({
       type: "command.received",
       commandId: claimed.commandId,
@@ -135008,4 +135008,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=D0F3FF58E9CFA79B64756E2164756E21
+//# debugId=F7D4048085B1B4E264756E2164756E21