chatroom-cli 1.65.13 → 1.65.14

package/dist/index.js

@@ -84820,6 +84820,50 @@ var init_participant = __esm(() => {
   ]);
 });
 
+// src/commands/machine/daemon-start/native-delivery-ledger.ts
+class NativeDeliveryLedger {
+  delivered = new Set;
+  inFlight = new Set;
+  deliveryKey(taskId, harnessSessionId) {
+    return `${taskId}\x00${harnessSessionId}`;
+  }
+  isDelivered(taskId, harnessSessionId) {
+    return this.delivered.has(this.deliveryKey(taskId, harnessSessionId));
+  }
+  tryAcquire(taskId, harnessSessionId) {
+    const key = this.deliveryKey(taskId, harnessSessionId);
+    if (this.delivered.has(key) || this.inFlight.has(key)) {
+      return false;
+    }
+    this.inFlight.add(key);
+    return true;
+  }
+  markDelivered(taskId, harnessSessionId) {
+    const key = this.deliveryKey(taskId, harnessSessionId);
+    this.inFlight.delete(key);
+    this.delivered.add(key);
+  }
+  clearDelivery(taskId, harnessSessionId) {
+    const key = this.deliveryKey(taskId, harnessSessionId);
+    this.inFlight.delete(key);
+    this.delivered.delete(key);
+  }
+  clearSession(harnessSessionId) {
+    const suffix = `\x00${harnessSessionId}`;
+    for (const key of [...this.delivered, ...this.inFlight]) {
+      if (key.endsWith(suffix)) {
+        this.delivered.delete(key);
+        this.inFlight.delete(key);
+      }
+    }
+  }
+}
+function getNativeDeliveryLedger() {
+  sharedLedger ??= new NativeDeliveryLedger;
+  return sharedLedger;
+}
+var sharedLedger;
+
 // src/commands/machine/daemon-start/native-ready-invariant.ts
 function isAgentReadyForNativeDelivery(task, slot) {
   return explainAgentReadyForNativeDeliveryBlock(task, slot) === null;
@@ -84950,6 +84994,12 @@ function explainNativeDeliveryBlock(task, opts) {
   }
   return explainAgentReadyForNativeDeliveryBlock(task, opts.slot);
 }
+function explainLedgerDeliveryBlock(taskId, harnessSessionId, ledger) {
+  if (ledger.isDelivered(taskId, harnessSessionId)) {
+    return "already_delivered_this_session";
+  }
+  return null;
+}
 function buildNativeInjectionPrompt(params) {
   const { taskDeliveryOutput, augmentationMode } = params;
   if (augmentationMode === "compact") {
@@ -85254,6 +85304,9 @@ var init_assigned_task_snapshot_store = __esm(() => {
 class NativeTaskDeliveryCoordinator {
   onSessionLost(params) {
     getRoleDeliveryState().resetDeliveryState(params.chatroomId, params.role);
+    if (params.harnessSessionId) {
+      getNativeDeliveryLedger().clearSession(params.harnessSessionId);
+    }
   }
   resetRoleDeliveryState(chatroomId, role) {
     getRoleDeliveryState().resetDeliveryState(chatroomId, role);
@@ -85280,6 +85333,7 @@ class NativeTaskDeliveryCoordinator {
   reconcileAssignedTasks(params) {
     const { tasks, runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = params;
     const deliveryState = getRoleDeliveryState();
+    const ledger = getNativeDeliveryLedger();
     const pendingFirst = [...tasks].sort((a, b) => {
       if (a.status === "pending" && b.status !== "pending")
         return -1;
@@ -85297,11 +85351,28 @@ class NativeTaskDeliveryCoordinator {
         }
         continue;
       }
+      const harnessSessionId = slot?.harnessSessionId;
+      if (!harnessSessionId) {
+        logNativeDeliverySkip(role, row.chatroomId, row.taskId, "harness_session_missing (pre-gate)");
+        continue;
+      }
+      const ledgerBlock = explainLedgerDeliveryBlock(row.taskId, harnessSessionId, ledger);
+      if (ledgerBlock) {
+        logNativeDeliverySkip(role, row.chatroomId, row.taskId, ledgerBlock);
+        continue;
+      }
+      if (!ledger.tryAcquire(row.taskId, harnessSessionId)) {
+        logNativeDeliverySkip(role, row.chatroomId, row.taskId, "delivery_ledger_busy (duplicate inject in flight)");
+        continue;
+      }
       if (!deliveryState.tryAcquireDelivery(row.chatroomId, role)) {
+        ledger.clearDelivery(row.taskId, harnessSessionId);
         logNativeDeliveryMutexSkip(role, row.chatroomId, row.taskId);
         continue;
       }
       logNativeDeliveryInjecting(role, row.chatroomId, row.taskId);
+      const taskId = row.taskId;
+      let deliveredToHarness = false;
       exports_Runtime.runFork(runtime4)(exports_Effect.gen(function* () {
         const full = yield* exports_Effect.tryPromise(() => sessionDeps.backend.query(api.machines.getAssignedTaskForAction, {
           sessionId: sessionDeps.sessionId,
@@ -85313,11 +85384,6 @@ class NativeTaskDeliveryCoordinator {
           console.warn(`[NativeDelivery:skip] ${role}@${row.chatroomId} task ${row.taskId} — task_hydrate_missing (deleted or not assigned)`);
           return;
         }
-        const harnessSessionId = slot?.harnessSessionId;
-        if (!harnessSessionId) {
-          console.warn(`[NativeDelivery:skip] ${role}@${row.chatroomId} task ${row.taskId} — harness_session_missing (post-gate)`);
-          return;
-        }
         yield* runNativeInjectionEffect(full, harnessSessionId, {
           sessionId: sessionDeps.sessionId,
           machineId: sessionDeps.machineId,
@@ -85326,12 +85392,19 @@ class NativeTaskDeliveryCoordinator {
             resumeTurnForSlot: (args2) => exports_Effect.runPromise(agentMgr.resumeTurnForSlot(args2))
           },
           convexUrl: sessionDeps.convexUrl,
-          onTaskDelivered: ({ chatroomId, role: role2, taskId }) => {
-            exports_Effect.runSync(agentMgr.setLastInFlightTask(chatroomId, role2, taskId));
+          onTaskDelivered: ({ chatroomId, role: role2, taskId: deliveredTaskId }) => {
+            deliveredToHarness = true;
+            ledger.markDelivered(deliveredTaskId, harnessSessionId);
+            exports_Effect.runSync(agentMgr.setLastInFlightTask(chatroomId, role2, deliveredTaskId));
             deliveryState.clearNativeNudgeFailures(chatroomId, role2);
           }
         });
-      }).pipe(exports_Effect.provide(effectContext2), exports_Effect.catchAll((err) => exports_Effect.sync(() => console.warn(`[NativeTaskDelivery] delivery failed for ${row.agentConfig.role}@${row.chatroomId}: ${getErrorMessage2(err)}`))), exports_Effect.ensuring(exports_Effect.sync(() => deliveryState.releaseDelivery(row.chatroomId, row.agentConfig.role)))));
+      }).pipe(exports_Effect.provide(effectContext2), exports_Effect.catchAll((err) => exports_Effect.sync(() => console.warn(`[NativeTaskDelivery] delivery failed for ${row.agentConfig.role}@${row.chatroomId}: ${getErrorMessage2(err)}`))), exports_Effect.ensuring(exports_Effect.sync(() => {
+        deliveryState.releaseDelivery(row.chatroomId, row.agentConfig.role);
+        if (!deliveredToHarness) {
+          ledger.clearDelivery(taskId, harnessSessionId);
+        }
+      }))));
       break;
     }
   }
@@ -85445,6 +85518,17 @@ async function deliverOneTask(deps, event, snapshot) {
   });
   if (!full)
     return false;
+  const ledger = getNativeDeliveryLedger();
+  const ledgerBlock = explainLedgerDeliveryBlock(snapshot.taskId, harnessSessionId, ledger);
+  if (ledgerBlock) {
+    console.warn(`[RestartOrchestrator] skip task ${snapshot.taskId} — ${ledgerBlock}`);
+    return false;
+  }
+  if (!ledger.tryAcquire(snapshot.taskId, harnessSessionId)) {
+    console.warn(`[RestartOrchestrator] skip task ${snapshot.taskId} — delivery_ledger_busy`);
+    return false;
+  }
+  let deliveredToHarness = false;
   try {
     await exports_Effect.runPromise(runNativeInjectionEffect(full, harnessSessionId, {
       sessionId: deps.session.sessionId,
@@ -85457,6 +85541,8 @@ async function deliverOneTask(deps, event, snapshot) {
         }
       },
       onTaskDelivered: ({ chatroomId, role, taskId }) => {
+        deliveredToHarness = true;
+        ledger.markDelivered(taskId, harnessSessionId);
         deps.agentMgr.setLastInFlightTask(chatroomId, role, taskId);
       }
     }));
@@ -85464,6 +85550,10 @@ async function deliverOneTask(deps, event, snapshot) {
   } catch (err) {
     console.warn(`[RestartOrchestrator] deliver failed for task ${snapshot.taskId}: ${getErrorMessage2(err)}`);
     return false;
+  } finally {
+    if (!deliveredToHarness) {
+      ledger.clearDelivery(snapshot.taskId, harnessSessionId);
+    }
   }
 }
 async function deliverPendingTasks(deps, event) {
@@ -85541,6 +85631,7 @@ var init_restart_orchestrator = __esm(() => {
   init_esm();
   init_native_ready_invariant();
   init_native_task_delivery_coordinator();
+  init_native_task_injector_logic();
   init_native_task_injector();
   init_api3();
   init_convex_error();
@@ -112092,4 +112183,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=7B7170D8323CA74F64756E2164756E21
+//# debugId=79E3EED5683A0EFF64756E2164756E21