@opengeni/worker-bundle 1.0.2-canary.37191796234001 → 1.0.2

package/dist/activities/agent-turn/quiescence.d.ts

@@ -175,7 +175,7 @@ export declare class MandatoryHistoryPersistenceError extends Error {
 }
 export declare function runMandatoryHistoryPersistenceStep<T>(stage: MandatoryHistoryPersistenceStage, operation: () => Promise<T>): Promise<T>;
 export type OpStreamFinalizer = {
-    finalizeOpStreamOps(): Promise<void>;
+    finalizeOpStreamOps(toolCallIds?: readonly string[]): Promise<void>;
 };
-/** Release retained Connected Machine output only after the turn is durable. */
-export declare function finalizeDurableTurnOpStreams(sessions: readonly unknown[], fallback: OpStreamFinalizer | null): Promise<void>;
+/** Release only durably recorded tool results, or the complete durable turn. */
+export declare function finalizeDurableTurnOpStreams(sessions: readonly unknown[], fallback: OpStreamFinalizer | null, toolCallIds?: readonly string[]): Promise<void>;

package/dist/activities/agent-turn/sandbox-runtime.d.ts

@@ -36,7 +36,7 @@ export declare function preemptSandboxTurnForDeadlineRotation(input: {
 export declare function createSandboxTurnRuntime(deps: SandboxTurnRuntimeDeps): {
     releaseLateSandbox: (sandbox: ResumedTurnSandbox) => Promise<void>;
     requireResolvedSandboxForMutation: (message: string) => ResumedTurnSandbox;
-    finalizeTurnOpStreamOps: () => Promise<void>;
+    finalizeTurnOpStreamOps: (toolCallIds?: readonly string[]) => Promise<void>;
     onHomeSandboxRebound: (rebound: {
         established: EstablishedSandboxSession;
         leaseEpoch: number;

package/dist/activities/agent-turn/stream-attempt.d.ts

@@ -49,7 +49,7 @@ export type TurnStreamAttemptDeps = {
     toolResultSpill: ToolResultSpill;
     claimedResult: ClaimedResult;
     flushRuntimeBatcher: () => Promise<void>;
-    finalizeTurnOpStreamOps: () => Promise<void>;
+    finalizeTurnOpStreamOps: (toolCallIds?: readonly string[]) => Promise<void>;
     runWorkspaceMutationForSandbox: <T>(sandbox: ResumedTurnSandbox, operation: string, mutation: () => Promise<T>, observePhase?: (measurement: {
         phase: "admission" | "provider" | "settlement" | "snapshot_wait";
         outcome: "completed" | "failed";

package/dist/activities/mcp-account-routes.d.ts

@@ -1,22 +1,3 @@
-import type { Settings } from "@opengeni/config";
-import type { McpConnectionAccountBinding, ToolRef, ToolAuthNeededPayload } from "@opengeni/contracts";
-import type { ApiIntegrationRuntime } from "@opengeni/db";
+import type { McpConnectionAccountBinding, ToolAuthNeededPayload } from "@opengeni/contracts";
 export declare function accountRouteAuthNeededPayload(payload: ToolAuthNeededPayload, bindings: readonly McpConnectionAccountBinding[] | null | undefined): ToolAuthNeededPayload;
-/** Expand only after canonical tool-policy admission. Aliases are execution
- * identities, never an alternate way to gain admission to a connector. */
-export declare function expandMcpAccountRoutes(input: {
-    settings: Settings;
-    tools: ToolRef[];
-    bindings: readonly McpConnectionAccountBinding[] | null | undefined;
-}): {
-    settings: Settings;
-    tools: ToolRef[];
-    accountLabels: ReadonlyMap<string, string>;
-};
-/** Each adapter closes over its own immutable credential ref and authority
- * generation. Sharing a provider transport never shares a credential resolver. */
-export declare function expandApiIntegrationAccountRoutes(input: {
-    integrations: readonly ApiIntegrationRuntime[];
-    bindings: readonly McpConnectionAccountBinding[] | null | undefined;
-    tools: readonly ToolRef[];
-}): ApiIntegrationRuntime[];
+export { expandMcpAccountRoutes, expandApiIntegrationAccountRoutes } from "@opengeni/core";

package/dist/activities/sandbox-lease.d.ts

@@ -171,7 +171,11 @@ export declare function createSandboxLeaseActivities(services: () => Promise<Act
  * adoption. A successor enrollment connection is intentionally irrelevant: no
  * query or cancellation is ever rebound to it. */
 export declare function reconcileConnectedMachineBackgroundCommands(db: ActivityServices["db"], settings: ActivityServices["settings"], observability: ActivityServices["observability"], bus: ActivityServices["bus"], controlRpcOverride?: ControlRpc): Promise<void>;
-export declare function replayConnectedCommandOutput(client: Pick<OpStreamExecClient, "readExisting">, opId: string, terminalKnown: boolean, capture: Parameters<OpStreamExecClient["readExisting"]>[2]): Promise<void>;
+export declare function replayConnectedCommandOutput(client: Pick<OpStreamExecClient, "readExisting">, opId: string, terminalKnown: boolean, capture: Parameters<OpStreamExecClient["readExisting"]>[2]): Promise<Awaited<ReturnType<OpStreamExecClient["readExisting"]>>>;
+/** Drain the durable terminal-output obligation independently of the launching
+ * attempt or model completion notice. Existing terminal rows receive no inferred
+ * receipt: they must replay and capture all retained bytes before any final ACK. */
+export declare function reconcileConnectedCommandOutputReleases(db: ActivityServices["db"], settings: ActivityServices["settings"], observability: ActivityServices["observability"], bus: ActivityServices["bus"], controlRpcOverride?: ControlRpc): Promise<void>;
 export declare function probeConnectedMachineBackgroundCommand(claim: ConnectedMachineBackgroundCommandClaim, controlRpc: ControlRpc, controlTimeoutMs: number, observedAt?: Date): Promise<ConnectedMachineBackgroundCommandProof | null>;
 export declare function connectedCommandProofFromStatus(status: OpStatus, observedAt: Date): ConnectedMachineBackgroundCommandProof | null;
 type RetainedProcessDeferralOutcome = Extract<RetainedProcessProbeResult, {

package/dist/{activities-control-7UP475T4.js → activities-control-BNPTRTOE.js}

@@ -35,7 +35,7 @@ import {
   warnDrainSnapshotFailure,
   withFirstPartyTools,
   workflowIdForSession
-} from "./chunk-ZEKFFMAY.js";
+} from "./chunk-LJX7Z2KP.js";
 import {
   inspectOpenSandboxKubernetesInventory,
   recordActiveUserGauges,
@@ -2810,9 +2810,12 @@ import {
   settleRetainedProcess
 } from "@opengeni/db";
 import {
+  claimConnectedCommandOutputReleases,
   claimConnectedMachineSessionBackgroundCommands,
   deferConnectedMachineBackgroundCommandReconciliation,
-  recordConnectedMachineBackgroundCommandProof
+  recordConnectedMachineBackgroundCommandProof,
+  recordConnectedCommandOutputConsumption,
+  settleConnectedCommandOutputReleaseClaim
 } from "@opengeni/db/session-background-commands";
 import { sandboxWarmRateMicrosPerSecond } from "@opengeni/config";
 import { appendSessionCommandOutput } from "@opengeni/db/session-command-output";
@@ -3137,6 +3140,7 @@ function createSandboxLeaseActivities(services, options = {}) {
       const rotationsRequested = input.rotationsRequested;
       let modalOrphansTerminated = 0;
       await reconcileConnectedMachineBackgroundCommands(db, settings, observability, service.bus);
+      await reconcileConnectedCommandOutputReleases(db, settings, observability, service.bus);
       try {
         await reconcileModalProviderCreates(
           db,
@@ -3458,6 +3462,7 @@ async function reconcileConnectedMachineBackgroundCommands(db, settings, observa
     );
     await forEachWithConcurrency(claims, SANDBOX_MAINTENANCE_ITEM_CONCURRENCY, async (claim) => {
       let proof = claim.proof;
+      let outputReplay = null;
       const connectionKey = JSON.stringify([
         claim.controlWorkspaceId,
         claim.enrollmentId,
@@ -3513,7 +3518,7 @@ async function reconcileConnectedMachineBackgroundCommands(db, settings, observa
               journal: { attachGeneration: () => String(Date.now()), persistSettled: () => {
               } }
             });
-            await replayConnectedCommandOutput(
+            outputReplay = await replayConnectedCommandOutput(
               client,
               claim.opId,
               Boolean(proof),
@@ -3571,6 +3576,15 @@ async function reconcileConnectedMachineBackgroundCommands(db, settings, observa
         if (!settlement.settled) {
           throw new Error("Connected command settlement lost its exact claim or proof");
         }
+        const receipt = outputReplay?.outputReceipt ?? (outputReplay?.status === "running" ? outputReplay.terminal?.outputReceipt : void 0);
+        const terminal = outputReplay?.status === "completed" ? outputReplay : outputReplay?.terminal;
+        if (proof.outcome === "exited" && receipt && terminal) {
+          await recordConnectedCommandOutputConsumption(db, {
+            ...claim,
+            receipt,
+            exitCode: terminal.outcome.response.exitCode
+          });
+        }
         if (settlement.events.length > 0) {
           try {
             await bus.publish(claim.workspaceId, claim.sessionId, settlement.events);
@@ -3599,13 +3613,128 @@ async function replayConnectedCommandOutput(client, opId, terminalKnown, capture
   while (true) {
     const before = capturedThrough;
     const replay = await client.readExisting(opId, terminalKnown ? 5e3 : 250, capture);
-    if (!terminalKnown || replay.status === "completed" || replay.terminal) return;
+    if (!terminalKnown || replay.status === "completed" || replay.terminal) return replay;
     capturedThrough = BigInt(replay.replaySequence);
     if (capturedThrough === before) {
       throw new Error("Connected command terminal output replay has not reached its exit frontier");
     }
   }
 }
+async function reconcileConnectedCommandOutputReleases(db, settings, observability, bus, controlRpcOverride) {
+  const dueBefore = /* @__PURE__ */ new Date();
+  const deadline = Date.now() + settings.sandboxLeaseReaperPeriodMs;
+  const controlRpc = controlRpcOverride ?? new NatsControlRpc(async () => bus.getRequestConnection());
+  do {
+    let claims;
+    try {
+      claims = await claimConnectedCommandOutputReleases(db, {
+        claimId: crypto.randomUUID(),
+        dueBefore,
+        limit: CONNECTED_COMMAND_RECONCILIATION_LIMIT,
+        claimTtlMs: CONNECTED_COMMAND_RECONCILIATION_CLAIM_TTL_MS
+      });
+    } catch (error) {
+      recordConnectedCommandReconciliation(observability, "claim_failed");
+      observability.warn("sandbox reaper: connected-command output claim failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return;
+    }
+    await forEachWithConcurrency(claims, SANDBOX_MAINTENANCE_ITEM_CONCURRENCY, async (claim) => {
+      try {
+        if (!bus.getOpStreamConnection)
+          throw new Error("Connected command output transport unavailable");
+        const rpcSubject = subjectFor(
+          claim.controlWorkspaceId,
+          claim.enrollmentId,
+          claim.connectionInstanceId
+        );
+        const controlTimeoutMs = Math.min(
+          settings.sandboxSelfhostedControlTimeoutMs,
+          RETAINED_PROCESS_PROVIDER_PROBE_TIMEOUT_MS
+        );
+        const client = new OpStreamExecClient({
+          workspaceId: claim.controlWorkspaceId,
+          agentId: claim.enrollmentId,
+          connectionInstanceId: claim.connectionInstanceId,
+          epoch: 0,
+          controlRpc,
+          rpcSubject,
+          transport: new NatsOpStreamTransport(async () => bus.getOpStreamConnection?.() ?? null),
+          controlTimeoutMs,
+          retryClock: defaultSelfhostedRetryClock,
+          journal: {
+            attachGeneration: () => String(Date.now()),
+            persistSettled: () => {
+              throw new Error("Background output release requires its database receipt");
+            }
+          }
+        });
+        let receipt = claim.receipt;
+        if (!receipt) {
+          const status = await querySelfhostedOp({
+            controlRpc,
+            rpcSubject,
+            opId: claim.opId,
+            controlTimeoutMs
+          });
+          if (status.state === OpState.OP_STATE_LOST) {
+            if (!await settleConnectedCommandOutputReleaseClaim(db, {
+              claim,
+              outcome: "unavailable",
+              retryAfterMs: 0
+            }))
+              throw new Error("Connected command output loss no longer owns its exact claim");
+            recordConnectedCommandReconciliation(observability, "output_unavailable");
+            return;
+          }
+          if (status.state !== OpState.OP_STATE_COMPLETE)
+            throw new Error("Terminal command output returned a live operation");
+          const replay = await replayConnectedCommandOutput(
+            client,
+            claim.opId,
+            true,
+            async (frames) => captureConnectedCommandOutput(db, claim, bus)(claim.commandId, frames)
+          );
+          const terminal = replay.status === "completed" ? replay : replay.terminal;
+          receipt = replay.outputReceipt ?? (replay.status === "running" ? replay.terminal?.outputReceipt : void 0) ?? null;
+          if (!terminal || !receipt)
+            throw new Error("Connected command output replay has no complete custody receipt");
+          await recordConnectedCommandOutputConsumption(db, {
+            ...claim,
+            receipt,
+            exitCode: terminal.outcome.response.exitCode
+          });
+        }
+        const outcome = await client.releaseCapturedOutput(claim.opId, receipt);
+        if (!await settleConnectedCommandOutputReleaseClaim(db, {
+          claim,
+          outcome,
+          retryAfterMs: outcome === "published" ? settings.sandboxLeaseReaperPeriodMs : 0
+        }))
+          throw new Error("Connected command output release no longer owns its exact claim");
+        recordConnectedCommandReconciliation(
+          observability,
+          outcome === "published" ? "output_ack_published" : "output_released"
+        );
+      } catch (error) {
+        await settleConnectedCommandOutputReleaseClaim(db, {
+          claim,
+          outcome: "retry",
+          retryAfterMs: Math.min(
+            5 * 6e4,
+            Math.max(settings.sandboxLeaseReaperPeriodMs, 3e4) * 2 ** Math.min(4, claim.reconcileAttempts - 1)
+          )
+        }).catch(() => false);
+        observability.warn("sandbox reaper: connected-command output release deferred", {
+          commandId: claim.commandId,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    });
+    if (claims.length < CONNECTED_COMMAND_RECONCILIATION_LIMIT) break;
+  } while (Date.now() < deadline);
+}
 async function probeConnectedMachineBackgroundCommand(claim, controlRpc, controlTimeoutMs, observedAt = /* @__PURE__ */ new Date()) {
   const input = {
     controlRpc,
@@ -6142,7 +6271,7 @@ function createScheduledTaskActivities(services) {
       ) : null;
       const slackBotMetadata = slackBotConnection ? openGeniSlackBotMetadata(slackBotConnection.metadata) : null;
       if (slackBotConnection && !slackBotMetadata) {
-        throw new Error("OpenGeni Slack bot connection metadata is invalid");
+        throw new Error("Opengeni Slack bot connection metadata is invalid");
       }
       const xaiAuthoritySubjectId = taskXaiProviderAccountAuthoritySnapshot.scope === "user" && task.createdBy.kind === "subject" ? task.createdBy.subjectId : null;
       if (taskXaiProviderAccountAuthoritySnapshot.scope === "user" && !xaiAuthoritySubjectId) {
@@ -6575,7 +6704,7 @@ function createScheduledTaskActivities(services) {
               }
               if (scheduledSlackBotConnectionId(session.metadata) !== (task.agentConfig.slackBotConnectionId ?? null)) {
                 throw new Error(
-                  "scheduled alert occurrence OpenGeni Slack bot binding does not match its canonical session"
+                  "scheduled alert occurrence Opengeni Slack bot binding does not match its canonical session"
                 );
               }
             }
@@ -7037,7 +7166,7 @@ function assertReusableSessionBindingMatches(session, task) {
   if (scheduledSlackBotConnectionId(session.metadata) !== (task.agentConfig.slackBotConnectionId ?? null)) {
     throw new ScheduledRunTerminalAuthorityError(
       "scheduled_reusable_binding_changed",
-      "scheduled task OpenGeni Slack bot binding does not match its reusable session"
+      "scheduled task Opengeni Slack bot binding does not match its reusable session"
     );
   }
 }
@@ -8668,4 +8797,4 @@ export {
   createControlActivities,
   createControlActivitiesFromServices
 };
-//# sourceMappingURL=activities-control-7UP475T4.js.map
+//# sourceMappingURL=activities-control-BNPTRTOE.js.map