@opengeni/worker-bundle 1.0.1 → 2.0.0

package/dist/{chunk-CYITU5UH.js → chunk-TVEE2UUC.js}

@@ -1,6 +1,6 @@
 import {
   observabilityEventLogger
-} from "./chunk-A4XQWVZK.js";
+} from "./chunk-I7HKKMUJ.js";
 
 // src/activity-services.ts
 import { dbSearchPath, getSettings, resolveNatsControlPlaneAuth } from "@opengeni/config";
@@ -220,7 +220,7 @@ function exactPersonalGitHubDelegation(delegations, credentialBindingId) {
     (delegation2) => delegation2.serverId === PERSONAL_GITHUB_SERVER_ID && delegation2.connectionType === "github_personal" && delegation2.personalGitHubRepositorySelection?.credentialBindingId === credentialBindingId
   );
   const delegation = matches[0];
-  if (matches.length !== 1 || !delegation || delegation.providerDomain !== "github.com" || delegation.kind !== "oauth2" || !delegation.originWorkspaceId || !delegation.userDelegation || !delegation.personalGitHubRepositorySelection) {
+  if (matches.length !== 1 || !delegation || delegation.providerDomain !== "github.com" || delegation.kind !== "oauth2" || !delegation.originWorkspaceId || !delegation.personalGitHubRepositorySelection) {
     throw new Error("personal GitHub Git delegation is unavailable");
   }
   return delegation;
@@ -246,7 +246,6 @@ function exactRequestedRepositories(refs, credentialBindingId, snapshots) {
 // src/pr-review-credentials.ts
 import { environmentsEncryptionKeyBytes } from "@opengeni/config";
 import { prReviewRegistrationIdFromCredentialBinding } from "@opengeni/core";
-import { createNativeRemoteMcpCredentialsPort } from "@opengeni/core/remote-mcp-credentials";
 import { decryptVariableSetValue, resolvePrReviewGitCredential } from "@opengeni/db";
 import {
   createGitHubAppInstallationTokenWithExpiry,
@@ -254,7 +253,6 @@ import {
 } from "@opengeni/github";
 function createStandaloneConnectionCredentialsPort(settings, db) {
   return {
-    ...createNativeRemoteMcpCredentialsPort(settings, db),
     gitCredentials: async (request) => await resolveStandaloneGitCredentials(settings, db, request)
   };
 }
@@ -433,6 +431,7 @@ function createSharedActivityServices(dependencies) {
 
 // src/activities/codex-capacity.ts
 import {
+  connectionModelAllowed as connectionModelAllowed2,
   armCodexCapacityWait,
   fetchCodexUsageForAccount,
   getCodexCapacityWaitForSession,
@@ -571,8 +570,9 @@ async function refreshExhaustedXaiQuota(input) {
 }
 
 // src/activities/codex-rotation.ts
-function codexAccountNeedsLiveCapacityRefresh(account, now) {
-  return (account.primaryUsedPercent ?? 0) >= CODEX_USAGE_EXHAUSTED_PCT || (account.secondaryUsedPercent ?? 0) >= CODEX_USAGE_EXHAUSTED_PCT || account.exhaustedKind === "quota" && account.exhaustedUntil !== null && account.exhaustedUntil > now;
+import { connectionModelAllowed } from "@opengeni/db";
+function codexAccountNeedsLiveCapacityRefresh(account, _now) {
+  return (account.primaryUsedPercent ?? 0) >= CODEX_USAGE_EXHAUSTED_PCT || (account.secondaryUsedPercent ?? 0) >= CODEX_USAGE_EXHAUSTED_PCT || account.exhaustedKind === "quota" && account.exhaustedUntil !== null;
 }
 function effectiveRotationStrategy(_stored) {
   return "sharded";
@@ -761,7 +761,13 @@ function chooseRotationActive(args) {
   return decide(chosen);
 }
 function selectCodexCredentialLeaseForTurn(args) {
-  const { accounts, activeCredentialId, rotationEnabled, rotationStrategy, existingCredentialId } = args.context;
+  const { activeCredentialId, rotationEnabled, rotationStrategy, existingCredentialId } = args.context;
+  if (args.context.failoverExhausted) {
+    return { credentialId: null, decision: { kind: "none" }, advanceActivePointer: false };
+  }
+  const accounts = args.context.modelId ? args.context.accounts.filter(
+    (account) => connectionModelAllowed(account.allowedModelIds, args.context.modelId)
+  ) : args.context.accounts;
   const failedCredentialIds = new Set(args.context.failedCredentialIds ?? []);
   const strategy = effectiveRotationStrategy(rotationStrategy);
   const existing = existingCredentialId ? accounts.find((account) => account.id === existingCredentialId) : void 0;
@@ -787,6 +793,9 @@ function selectCodexCredentialLeaseForTurn(args) {
     if (!pinned) {
       return { credentialId: null, decision: { kind: "none" }, advanceActivePointer: false };
     }
+    if (failedCredentialIds.has(pinned.id)) {
+      return { credentialId: null, decision: { kind: "none" }, advanceActivePointer: false };
+    }
     if (!pinned.allocatorEnabled) {
       return {
         credentialId: null,
@@ -843,6 +852,9 @@ function selectCodexCredentialLeaseForTurn(args) {
     if (!active) {
       return { credentialId: null, decision: { kind: "none" }, advanceActivePointer: false };
     }
+    if (failedCredentialIds.has(active.id)) {
+      return { credentialId: null, decision: { kind: "none" }, advanceActivePointer: false };
+    }
     if (!active.allocatorEnabled) {
       return {
         credentialId: null,
@@ -910,8 +922,13 @@ async function signalPendingCodexCapacityWakeTargets(services, workspaceId) {
   );
   await signalCodexCapacityWakeTargets(services, targets);
 }
-function codexCapacityDecision(context) {
-  const now = /* @__PURE__ */ new Date();
+function codexCapacityDecision(context, now = /* @__PURE__ */ new Date()) {
+  context = {
+    ...context,
+    accounts: context.accounts.filter(
+      (account) => !context.modelId || connectionModelAllowed2(account.allowedModelIds, context.modelId)
+    )
+  };
   const selected = selectCodexCredentialLeaseForTurn({
     context,
     sessionId: context.sessionId,
@@ -928,7 +945,9 @@ function codexCapacityDecision(context) {
       credentialId: selected.credentialId,
       diagnostic: {
         connectedCount: context.accounts.length,
-        eligibleCount: context.accounts.filter((account) => isCodexCredentialEligible(account, now)).length
+        eligibleCount: context.accounts.filter(
+          (account) => (account.id === selected.credentialId || !context.failedCredentialIds?.includes(account.id)) && isCodexCredentialEligible(account, now)
+        ).length
       }
     };
   }
@@ -936,7 +955,7 @@ function codexCapacityDecision(context) {
   const capacityAccounts = policyCredentialId ? context.accounts.filter((account) => account.id === policyCredentialId) : context.accounts;
   const authoritativeReset = authoritativeCodexCapacityResetAt(capacityAccounts, now);
   const hasReconcilableQuotaCooldown = capacityAccounts.some(
-    (account) => account.status === "active" && account.allocatorEnabled && account.exhaustedKind === "quota" && account.exhaustedUntil !== null && account.exhaustedUntil > now
+    (account) => account.status === "active" && account.allocatorEnabled && account.exhaustedKind === "quota" && account.exhaustedUntil !== null
   );
   const policyAccount = capacityAccounts[0] ?? null;
   const mutationOnlyStatusBlock = policyAccount != null && (!policyAccount.allocatorEnabled || policyAccount.status !== "active") || authoritativeReset === null && capacityAccounts.length > 0 && capacityAccounts.every(
@@ -946,7 +965,7 @@ function codexCapacityDecision(context) {
   return {
     kind: "unavailable",
     earliestResetAt: authoritativeReset,
-    resetKind: selected.decision.kind === "none" || selected.decision.kind === "allocatorDisabled" || mutationOnlyStatusBlock ? "mutation_only" : authoritativeReset && !hasReconcilableQuotaCooldown ? "authoritative" : "bounded_refresh",
+    resetKind: selected.decision.kind === "none" && !hasReconcilableQuotaCooldown && !authoritativeReset || selected.decision.kind === "allocatorDisabled" || mutationOnlyStatusBlock ? "mutation_only" : authoritativeReset && !hasReconcilableQuotaCooldown ? "authoritative" : "bounded_refresh",
     diagnostic: {
       connectedCount: context.accounts.length,
       allocatorEnabledCount: context.accounts.filter((account) => account.allocatorEnabled).length,
@@ -957,6 +976,16 @@ function codexCapacityDecision(context) {
 }
 async function armAndReconcileCodexCapacityWait(services, input, options = {}) {
   const armed = await armCodexCapacityWait(services.db, input);
+  if (armed.action === "stopped") {
+    options.onArmed?.();
+    await publishDurableSessionEvents(
+      services.bus,
+      input.workspaceId,
+      input.sessionId,
+      armed.events
+    );
+    return armed;
+  }
   if (armed.action !== "waiting") return armed;
   options.onArmed?.();
   await publishDurableSessionEvents(services.bus, input.workspaceId, input.sessionId, armed.events);
@@ -980,15 +1009,22 @@ async function armAndReconcileCodexCapacityWait(services, input, options = {}) {
   );
   return evaluated;
 }
-async function refreshCapacityMetadata(services, workspaceId) {
-  const accounts = await listCodexAccountStatuses(services.db, workspaceId).catch(() => []);
+async function refreshCapacityMetadata(services, workspaceId, turnId) {
+  const accounts = await listCodexAccountStatuses(services.db, workspaceId, turnId).catch(() => []);
   const now = /* @__PURE__ */ new Date();
   const stale = accounts.filter(
     (account) => account.allocatorEnabled && account.status === "active" && (codexAccountNeedsLiveCapacityRefresh(account, now) || account.usageCheckedAt === null)
   );
   await refreshCodexUsageAndRepairCapacityWaiters(
     stale.map(
-      (account) => () => fetchCodexUsageForAccount(services.db, services.settings, workspaceId, account.id)
+      (account) => () => fetchCodexUsageForAccount(
+        services.db,
+        services.settings,
+        workspaceId,
+        account.id,
+        void 0,
+        turnId
+      )
     ),
     () => signalPendingCodexCapacityWakeTargets(services, workspaceId)
   );
@@ -1078,7 +1114,7 @@ function createCodexCapacityActivities(services) {
     }
     const boundedRefreshAttempted = current.resetKind === "bounded_refresh" && input.cause === "timer" && current.nextCheckAt.getTime() <= Date.now();
     if (boundedRefreshAttempted) {
-      await refreshCapacityMetadata(resolved, input.workspaceId);
+      await refreshCapacityMetadata(resolved, input.workspaceId, current.blockedTurnId);
     }
     const result = await reconcileCodexCapacityWaitDb(
       resolved.db,
@@ -1427,6 +1463,7 @@ function goalContinuationPrompt(_goal, _autoContinuation, _cap, options = {}) {
     "- For every explicit requirement, named artifact, command, test, gate, invariant, and deliverable, identify and inspect the authoritative evidence that would prove it.",
     "- Match verification scope to requirement scope. Treat uncertain, indirect, incomplete, or missing evidence as not achieved and continue working.",
     "- The audit must prove completion, not merely fail to find obvious remaining work.",
+    "- For user-facing report deliverables, including reports produced during another task, follow the Documents Skill: create the durable native document first, inspect its relevant final head after the last edit, and provide the returned artifact reference. Declare report requirements through the available goal tools before authoring and satisfy every persisted report requirement with verified artifact delivery evidence before completion. Sandbox paths and raw file IDs do not prove report delivery. If artifact tooling or access is unavailable, keep that deliverable incomplete and state the blocker; never invent proof or silently substitute a local report. Ordinary chat answers, short progress updates, source-code links, and explicitly requested local-file work remain outside this report contract.",
     "",
     "Do not rely on intent, partial progress, memory of earlier work, or a plausible final answer as proof of completion. Call opengeni__goal_complete with concrete evidence only when the full objective is actually achieved and no required work remains.",
     "",
@@ -4583,65 +4620,10 @@ var SyncFailure = class extends Error {
 import {
   resolveRigProviderImageSelection,
   rigProviderImageSourceImage,
-  settingsWithPackSandboxImage,
   settingsWithRigImage,
   settingsWithRigProviderImage
 } from "@opengeni/core";
 
-// src/activities/packs.ts
-import { getWorkspace, listInstalledPortableSkills } from "@opengeni/db";
-import {
-  legacySandboxRuntimeFromPacks,
-  packInstallationUsesLegacyRuntime,
-  resolveWorkspaceLegacyRuntimePacks
-} from "@opengeni/core";
-import {
-  buildPortableSkillArtifact
-} from "@opengeni/runtime";
-var emptyPackRuntime = {
-  sandboxImage: null,
-  sandboxProviderImages: null,
-  skillActivations: []
-};
-async function resolveWorkspacePackRuntime(db, workspaceId) {
-  const packs = await resolveWorkspaceLegacyRuntimePacks(db, workspaceId);
-  if (packs.length === 0) return emptyPackRuntime;
-  return workspacePackRuntimeFromPacks(packs);
-}
-function workspacePackRuntimeFromPacks(packs) {
-  const sandboxRuntime = legacySandboxRuntimeFromPacks(packs);
-  const skillActivations = [];
-  const skillOwners = /* @__PURE__ */ new Map();
-  for (const pack of [...packs].sort((a, b) => a.id.localeCompare(b.id))) {
-    for (const skill of pack.skills) {
-      const key = skill.name.toLowerCase();
-      const existingOwner = skillOwners.get(key);
-      if (existingOwner !== void 0 && existingOwner !== pack.id) {
-        throw new Error(
-          `Enabled packs ${existingOwner} and ${pack.id} both declare a skill named "${skill.name}". Pack skill names must be unique across enabled packs; disable one of the packs and retry.`
-        );
-      }
-      skillOwners.set(key, pack.id);
-      const artifact = {
-        name: skill.name,
-        description: skill.description ?? null,
-        files: skill.files.map((file) => ({ path: file.path, content: file.content }))
-      };
-      skillActivations.push({
-        source: "pack",
-        id: `pack:${pack.id}:${skill.name}`,
-        artifact,
-        reason: `active legacy Pack ${pack.id}`
-      });
-    }
-  }
-  return {
-    sandboxImage: sandboxRuntime.sandboxImage,
-    sandboxProviderImages: sandboxRuntime.sandboxProviderImages,
-    skillActivations
-  };
-}
-
 // src/activities/streaming.ts
 import { TURN_ACTIVITY_CANCELLATION_HEARTBEAT_INTERVAL_MS } from "@opengeni/core";
 import { Context } from "@temporalio/activity";
@@ -4816,6 +4798,73 @@ async function nextStreamEvent(iterator, context) {
   });
 }
 
+// src/sandbox-snapshot-diagnostics.ts
+import { sandboxLeaseTelemetryKey } from "@opengeni/observability";
+function safeSnapshotError(error, origin = "sandbox-resume") {
+  const fields = {
+    errorClass: "SnapshotOperationError",
+    errorCode: "snapshot_operation_failed",
+    origin
+  };
+  try {
+    if (error && typeof error === "object") {
+      const candidate = error;
+      if (typeof candidate.name === "string" && /^[A-Z][A-Za-z0-9]{2,62}Error$/u.test(candidate.name)) {
+        fields.causeName = candidate.name;
+      }
+      if (typeof candidate.code === "string" && /^[a-z0-9_]{1,64}$/u.test(candidate.code)) {
+        fields.integrityCode = candidate.code;
+      }
+      const status = Number(candidate.status ?? candidate.statusCode);
+      if (Number.isInteger(status) && status >= 100 && status <= 599) fields.status = status;
+    }
+  } catch {
+  }
+  const read = (value, key) => {
+    try {
+      return value && typeof value === "object" ? Reflect.get(value, key) : void 0;
+    } catch {
+      return void 0;
+    }
+  };
+  const details = read(error, "details");
+  const providerName = read(details, "errorName");
+  if (typeof providerName === "string" && [
+    "ClientError",
+    "TimeoutError",
+    "ConnectionError",
+    "AuthError",
+    "NotFoundError",
+    "InvalidError",
+    "RemoteError",
+    "AbortError"
+  ].includes(providerName))
+    fields.providerErrorName = providerName;
+  const grpcCode = read(details, "errorCode");
+  if (providerName === "ClientError" && typeof grpcCode === "number" && Number.isInteger(grpcCode) && grpcCode >= 0 && grpcCode <= 16)
+    fields.providerGrpcCode = grpcCode;
+  for (const key of ["status", "httpStatus", "responseStatus"]) {
+    const status = read(details, key);
+    if (typeof status === "number" && Number.isInteger(status) && status >= 100 && status <= 599) {
+      fields.providerHttpStatus = status;
+      break;
+    }
+  }
+  const retryable = read(error, "retryable");
+  if (typeof retryable === "boolean") fields.providerRetryable = retryable;
+  return fields;
+}
+function warnDrainSnapshotFailure(observability, message, error, lease) {
+  try {
+    observability.warn(message, {
+      ...safeSnapshotError(error, "worker-lifecycle"),
+      ...lease.workspaceId ? { sandboxLeaseKey: sandboxLeaseTelemetryKey(lease.workspaceId, lease.sandboxGroupId) } : {},
+      leaseEpoch: lease.leaseEpoch
+    });
+  } catch {
+  }
+}
+
 // src/sandbox-archive-storage.ts
 import { uploadWorkspaceArchiveSpool } from "@opengeni/storage";
 import { randomUUID as randomUUID2 } from "crypto";
@@ -4952,12 +5001,13 @@ async function deleteUnpublishedWorkspaceArchiveObject(objectStorage, ref, metri
 import { sandboxLifecycleTransitionWaitMs as sandboxLifecycleTransitionWaitMs2 } from "@opengeni/config";
 import {
   createProviderCommandRetainer,
-  retainedProviderCommandPersistence
+  supervisedCommandProtocolReady
 } from "@opengeni/db/retained-provider-commands";
 import {
   adoptConnectedMachineSessionBackgroundCommand,
   adoptManagedSessionBackgroundCommand,
   advanceWorkspaceGenerationForRetainedProcess,
+  retainedProviderCommandPersistence,
   advanceWorkspaceGeneration,
   getRetainedProcess,
   retainWorkspaceMutationProcess,
@@ -5002,6 +5052,15 @@ import {
   sandboxLifecycleTransitionWaitMs
 } from "@opengeni/config";
 import { randomUUID as randomUUID3 } from "crypto";
+
+// src/warm-capture-holder.ts
+function retainsHolderForWarmCapture(lease, expectedEpoch, now = Date.now()) {
+  return Boolean(
+    lease?.liveness === "warm" && lease.leaseEpoch === expectedEpoch && lease.archiveCapture && lease.archiveCapture.deadlineAt.getTime() > now
+  );
+}
+
+// src/sandbox-resume.ts
 import {
   acquireLease,
   adoptLegacyModalCheckpointArtifact,
@@ -5054,6 +5113,7 @@ import {
   downloadWorkspaceArchiveSpool,
   WorkspaceArchiveStorageError
 } from "@opengeni/storage";
+import { sandboxLeaseTelemetryKey as sandboxLeaseTelemetryKey2 } from "@opengeni/observability";
 import { parseWorkspaceArchiveObjectRef as parseWorkspaceArchiveObjectRef2 } from "@opengeni/contracts";
 function sandboxLeaseHolderIdForAttempt(attemptId) {
   const normalized = attemptId.trim();
@@ -5160,29 +5220,6 @@ var SnapshotTimeoutError = class extends Error {
     this.name = "SnapshotTimeoutError";
   }
 };
-function safeSnapshotError(error) {
-  const fields = {
-    errorClass: "SnapshotOperationError",
-    errorCode: "snapshot_operation_failed",
-    origin: "sandbox-resume"
-  };
-  try {
-    if (error && typeof error === "object") {
-      const candidate = error;
-      if (typeof candidate.name === "string" && /^[A-Z][A-Za-z0-9]{2,62}Error$/u.test(candidate.name)) {
-        fields.causeName = candidate.name;
-      }
-      if (typeof candidate.code === "string" && /^[a-z0-9_]{1,64}$/u.test(candidate.code)) {
-        fields.integrityCode = candidate.code;
-      }
-      const rawStatus = candidate.status ?? candidate.statusCode;
-      const status = Number(rawStatus);
-      if (Number.isInteger(status) && status >= 100 && status <= 599) fields.status = status;
-    }
-  } catch {
-  }
-  return fields;
-}
 async function waitForWarmSnapshot(snapshot, timeoutMs, signal) {
   if (signal?.aborted) return false;
   let timeout;
@@ -5361,6 +5398,18 @@ function maybePersistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch, s
 }
 async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch, signal, force, registerOwnedContinuation) {
   const { db, settings } = services;
+  const warnSnapshotFailure = (message, error) => {
+    const fields = {
+      ...safeSnapshotError(error),
+      sandboxLeaseKey: sandboxLeaseTelemetryKey2(ids.workspaceId, ids.sandboxGroupId),
+      leaseEpoch
+    };
+    try {
+      if (services.observability) services.observability.warn(message, fields);
+      else console.warn(message, fields);
+    } catch {
+    }
+  };
   const intervalMs = settings.sandboxSnapshotIntervalMs;
   if (intervalMs <= 0 && !force) {
     return false;
@@ -5434,6 +5483,7 @@ async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch,
       } : {}
     });
     if (claimed.status !== "claimed") {
+      if (claimed.status === "throttled") return false;
       console.error("mid-session workspace snapshot skipped (capture claim)", {
         sandboxGroupId: ids.sandboxGroupId,
         status: claimed.status
@@ -5472,6 +5522,8 @@ async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch,
       }).catch(() => void 0);
     };
     const captureAndPublish = (async () => {
+      const captureStarted = performance.now();
+      let captureOutcome = "failed";
       let archive;
       let candidate = null;
       let publicationAttempted = false;
@@ -5521,6 +5573,7 @@ async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch,
         if (!wrote && candidate) {
           await abandonCandidate(candidate.id, "snapshot_publication_fenced");
         }
+        if (wrote) captureOutcome = "completed";
         return wrote;
       } catch (error) {
         if (candidate && !publicationAttempted)
@@ -5538,20 +5591,23 @@ async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch,
           expectedEpoch: leaseEpoch,
           expectedInstanceId: instanceId
         }).catch((error) => {
-          console.error(
-            "mid-session workspace capture gate release failed",
-            safeSnapshotError(error)
-          );
+          captureOutcome = "failed";
+          warnSnapshotFailure("mid-session workspace capture gate release failed", error);
         });
+        try {
+          services.sandboxMetrics?.onWorkspaceCapture?.({
+            backend: lease.backend,
+            outcome: captureOutcome,
+            durationSeconds: Math.max(0, performance.now() - captureStarted) / 1e3
+          });
+        } catch {
+        }
       }
     })();
     const settled = captureAndPublish.then(
       (persisted) => ({ kind: "settled", persisted }),
       (error) => {
-        console.error(
-          "mid-session workspace snapshot failed (turn unaffected)",
-          safeSnapshotError(error)
-        );
+        warnSnapshotFailure("mid-session workspace snapshot failed (turn unaffected)", error);
         return { kind: "settled", persisted: false };
       }
     );
@@ -5578,10 +5634,7 @@ async function persistWarmWorkspaceSnapshot(services, ids, session, leaseEpoch,
     });
     return outcome.kind === "settled" ? outcome.persisted : false;
   } catch (error) {
-    console.error(
-      "mid-session workspace snapshot failed (turn unaffected)",
-      safeSnapshotError(error)
-    );
+    warnSnapshotFailure("mid-session workspace snapshot failed (turn unaffected)", error);
     return false;
   }
 }
@@ -5714,7 +5767,12 @@ async function resumeBoxForTurn(services, ids, kind, holderId) {
     });
     await providerRenewalInFlight;
   };
-  const releaseDeadHolder = (reason) => {
+  const releaseDeadHolder = async (reason) => {
+    if (reason === "holder_gone" && kind === "turn" && holderLeaseHeartbeat) {
+      const expectedEpoch = holderLeaseHeartbeat.expectedEpoch;
+      const lease = await readLease(db, ids.workspaceId, ids.sandboxGroupId);
+      if (retainsHolderForWarmCapture(lease, expectedEpoch)) return;
+    }
     const message = "sandbox resume holder released: holder no longer live";
     const fields = {
       workspaceId: ids.workspaceId,
@@ -5738,14 +5796,14 @@ async function resumeBoxForTurn(services, ids, kind, holderId) {
         holderId,
         expectedEpoch: heartbeat2.expectedEpoch,
         leaseTtlMs: heartbeat2.leaseTtlMs
-      }).then((status) => {
+      }).then(async (status) => {
         if (heartbeat2 !== holderLeaseHeartbeat) return;
         if (!status.holderAlive) {
-          releaseDeadHolder(status.fence);
+          await releaseDeadHolder(status.fence);
           return;
         }
         if (status.fence === "epoch") {
-          releaseDeadHolder(status.fence);
+          await releaseDeadHolder(status.fence);
           return;
         }
         if (status.leaseExtended || status.fence === "rotation_requested") {
@@ -5760,10 +5818,10 @@ async function resumeBoxForTurn(services, ids, kind, holderId) {
       sandboxGroupId: ids.sandboxGroupId,
       kind,
       holderId
-    }).then((touched) => {
+    }).then(async (touched) => {
       if (heartbeat2 !== holderLeaseHeartbeat) return;
       if (!touched) {
-        releaseDeadHolder("holder_gone");
+        await releaseDeadHolder("holder_gone");
         return;
       }
       void maybeRenewProviderExpiration().catch(() => void 0);
@@ -5809,7 +5867,7 @@ async function resumeBoxForTurn(services, ids, kind, holderId) {
       let spawnEnvelope = fallbackArchiveEnvelope ?? acquired.lease.resumeState ?? envelope;
       const archiveSource = acquired.lease.recovery.archive.status === "none" ? fallbackArchiveEnvelope : acquired.lease.resumeState;
       const continuityRecovery = acquired.lease.recovery.continuity;
-      if (acquired.lease.recovery.archive.status === "available" && acquired.lease.archiveComplete || acquired.lease.recovery.archive.status === "none" && workspaceArchiveFieldsFromEnvelope(archiveSource) !== null) {
+      if (acquired.lease.recovery.archive.status === "available" && (acquired.lease.archiveComplete || acquired.lease.historicalRecoveryAuthorized === true) || acquired.lease.recovery.archive.status === "none" && workspaceArchiveFieldsFromEnvelope(archiveSource) !== null) {
         const rematerializationId = crypto.randomUUID();
         const legacyNativeArchive = legacyNativeArchiveFromEnvelope(archiveSource);
         const begun = await beginSandboxRematerialization(db, {
@@ -6159,7 +6217,8 @@ async function resumeBoxForTurn(services, ids, kind, holderId) {
         workspaceId: ids.workspaceId,
         sandboxGroupId: ids.sandboxGroupId,
         expectedEpoch: leaseEpoch,
-        expectedInstanceId: live.instanceId
+        expectedInstanceId: live.instanceId,
+        expectedBackend: ids.backend
       });
       if (marked.status === "marked") {
         await services.onSandboxLost?.({
@@ -6289,7 +6348,7 @@ async function resolveCurrentHomeBackend(services, ids, established) {
     throw homeRouteRecoveryError(lease, fallbackEpoch);
   }
   if (lease.instanceId === established.instanceId) {
-    services.onHomeSandboxRebound?.({
+    await services.onHomeSandboxRebound?.({
       established,
       leaseEpoch: lease.leaseEpoch
     });
@@ -6329,6 +6388,7 @@ async function resolveCurrentHomeBackend(services, ids, established) {
       sandboxGroupId: ids.sandboxGroupId,
       expectedEpoch: lease.leaseEpoch,
       expectedInstanceId: lease.instanceId,
+      expectedBackend: lease.backend,
       diagnostic: "provider_not_found_during_home_route_rebind"
     });
     if (marked.status === "marked") {
@@ -6348,7 +6408,7 @@ async function resolveCurrentHomeBackend(services, ids, established) {
   if (rebound.instanceId !== lease.instanceId || reboundBackend !== resumeBackend) {
     throw homeRouteRecoveryError(lease, lease.leaseEpoch);
   }
-  services.onHomeSandboxRebound?.({
+  await services.onHomeSandboxRebound?.({
     established: rebound,
     leaseEpoch: lease.leaseEpoch
   });
@@ -6553,7 +6613,7 @@ function settleRetainedProcessForTurn(services, ids) {
       sessionId: ids.sessionId,
       processId: process2.id
     });
-    if (!durable || durable.providerSessionId !== process2.providerSessionId || durable.providerBackend !== backend.kind || durable.providerInstanceId !== backend.providerInstanceId || durable.leaseEpoch !== backend.leaseEpoch || durable.routeKind !== (backend.sandboxId === null ? "home" : "active") || durable.routeTargetId !== backend.sandboxId || durable.routeEpoch !== backend.activeEpoch) {
+    if (!durable || durable.providerSessionId !== process2.providerSessionId || durable.providerBackend !== (sandboxBackendForSdkBackendId(backend.kind) ?? backend.kind) || durable.providerInstanceId !== backend.providerInstanceId || durable.leaseEpoch !== backend.leaseEpoch || durable.routeKind !== (backend.sandboxId === null ? "home" : "active") || durable.routeTargetId !== backend.sandboxId || durable.routeEpoch !== backend.activeEpoch) {
       throw new Error("Retained-process settlement lost its exact durable backend identity");
     }
     const settlement = await settleRetainedProcess(services.db, {
@@ -6584,7 +6644,7 @@ function adoptRetainedProcessAsBackgroundCommandForTurn(services, ids) {
       sessionId: ids.sessionId,
       processId: process2.id
     });
-    if (!durable || durable.providerSessionId !== process2.providerSessionId || durable.providerBackend !== backend.kind || durable.providerInstanceId !== backend.providerInstanceId || durable.leaseEpoch !== backend.leaseEpoch || durable.routeKind !== (backend.sandboxId === null ? "home" : "active") || durable.routeTargetId !== backend.sandboxId || durable.routeEpoch !== backend.activeEpoch) {
+    if (!durable || durable.providerSessionId !== process2.providerSessionId || durable.providerBackend !== (sandboxBackendForSdkBackendId(backend.kind) ?? backend.kind) || durable.providerInstanceId !== backend.providerInstanceId || durable.leaseEpoch !== backend.leaseEpoch || durable.routeKind !== (backend.sandboxId === null ? "home" : "active") || durable.routeTargetId !== backend.sandboxId || durable.routeEpoch !== backend.activeEpoch) {
       throw new Error("Background command adoption lost its exact retained-process identity");
     }
     await adoptManagedSessionBackgroundCommand(services.db, {
@@ -6769,14 +6829,20 @@ function wrapTurnBoxWithRouting(services, ids, established) {
     },
     resolveActiveBackend: resolver,
     ...services.onSandboxOperation ? { onOperation: services.onSandboxOperation } : {},
+    ...services.onSandboxCaptureWait ? { onCaptureWait: services.onSandboxCaptureWait } : {},
     providerCommandHandle: admittedCommandHandle,
+    providerSupervisionReady: async () => settings.modalCommandSupervisionEnabled && await supervisedCommandProtocolReady(db),
     ...ids.workspaceMutationFence ? {
-      providerCommandPersistence: (process2) => retainedProviderCommandPersistence(db, {
-        accountId: ids.workspaceMutationFence.accountId,
-        workspaceId: ids.workspaceId,
-        sessionId: ids.sessionId,
-        processId: process2.id
-      })
+      providerCommandPersistence: (process2) => retainedProviderCommandPersistence(
+        db,
+        {
+          accountId: ids.workspaceMutationFence.accountId,
+          workspaceId: ids.workspaceId,
+          sessionId: ids.sessionId,
+          processId: process2.id
+        },
+        services.bus ? (events) => services.bus.publish(ids.workspaceId, ids.sessionId, events) : void 0
+      )
     } : {},
     ...beforeMutation ? { beforeMutation } : {},
     ...afterMutation ? { afterMutation } : {},
@@ -6801,6 +6867,7 @@ function wrapTurnBoxWithRouting(services, ids, established) {
           sandboxGroupId: home.sandboxGroupId,
           expectedEpoch,
           expectedInstanceId,
+          expectedBackend: home.backend,
           diagnostic: "provider_not_found_during_routed_operation"
         });
         if (marked.status === "marked") {
@@ -6965,15 +7032,21 @@ function wrapLazyTurnBoxWithRouting(services, ids, args) {
       return routedResolver(pointer);
     },
     ...services.onSandboxOperation ? { onOperation: services.onSandboxOperation } : {},
+    ...services.onSandboxCaptureWait ? { onCaptureWait: services.onSandboxCaptureWait } : {},
     ...args.onFirstOperation ? { onFirstOperation: args.onFirstOperation } : {},
     providerCommandHandle: admittedCommandHandle,
+    providerSupervisionReady: async () => settings.modalCommandSupervisionEnabled && await supervisedCommandProtocolReady(db),
     ...ids.workspaceMutationFence ? {
-      providerCommandPersistence: (process2) => retainedProviderCommandPersistence(db, {
-        accountId: ids.workspaceMutationFence.accountId,
-        workspaceId: ids.workspaceId,
-        sessionId: ids.sessionId,
-        processId: process2.id
-      })
+      providerCommandPersistence: (process2) => retainedProviderCommandPersistence(
+        db,
+        {
+          accountId: ids.workspaceMutationFence.accountId,
+          workspaceId: ids.workspaceId,
+          sessionId: ids.sessionId,
+          processId: process2.id
+        },
+        services.bus ? (events) => services.bus.publish(ids.workspaceId, ids.sessionId, events) : void 0
+      )
     } : {},
     ...beforeMutation ? { beforeMutation } : {},
     ...afterMutation ? { afterMutation } : {},
@@ -6999,6 +7072,7 @@ function wrapLazyTurnBoxWithRouting(services, ids, args) {
           sandboxGroupId: home.sandboxGroupId,
           expectedEpoch: backend.leaseEpoch,
           expectedInstanceId: backend.providerInstanceId,
+          expectedBackend: home.backend,
           diagnostic: "provider_not_found_during_routed_operation"
         });
         if (marked.status === "marked") {
@@ -7202,6 +7276,7 @@ import {
   getSession,
   getSessionGoal as getSessionGoal2,
   getSessionParentPersonalConnectionDelegations,
+  getSessionParentMcpAccountBindings,
   getSessionParentXaiProviderAccountAuthority,
   addSessionSystemUpdateWithSourceMutation,
   claimPendingSessionSystemUpdateOutbox,
@@ -7232,6 +7307,11 @@ async function notifyParentOfChildIdle(svc, workspaceId, childSessionId, episode
       workspaceId,
       childSessionId
     );
+    const mcpAccountBindings = await getSessionParentMcpAccountBindings(
+      svc.db,
+      workspaceId,
+      childSessionId
+    );
     const xaiAuthority = await getSessionParentXaiProviderAccountAuthority(
       svc.db,
       workspaceId,
@@ -7254,6 +7334,7 @@ async function notifyParentOfChildIdle(svc, workspaceId, childSessionId, episode
         ...xaiAuthority.subjectId ? { xaiAuthoritySubjectId: xaiAuthority.subjectId } : {}
       },
       personalConnectionDelegations,
+      mcpAccountBindings,
       xaiProviderAccountAuthoritySnapshot: xaiAuthority.snapshot
     });
     if (outbox.status === "delivered") {
@@ -7329,6 +7410,7 @@ async function deliverParentSystemUpdateOutbox(svc, outbox) {
         summary: outbox.summary,
         lineage: outbox.lineage,
         personalConnectionDelegations: outbox.personalConnectionDelegations,
+        mcpAccountBindings: outbox.mcpAccountBindings,
         xaiProviderAccountAuthoritySnapshot: outbox.xaiProviderAccountAuthoritySnapshot
       },
       async (tx) => {
@@ -8446,12 +8528,14 @@ async function persistOrSignalSessionAttemptQuiescence(input) {
   return "receipt";
 }
 async function drainAttemptOwnedSandboxWriters(input) {
+  input.onStage?.("tool_writers");
   if (input.toolCancellationFence) {
     input.toolCancellationFence.cancel(
       input.cancellationReason ?? new Error("TURN_ATTEMPT_FENCED")
     );
     await input.toolCancellationFence.waitForQuiescence();
   }
+  input.onStage?.("credential_renewals");
   await Promise.all(input.gitCredentialRenewals.map(async (renewal) => await renewal.stop()));
   await input.codemodeTokenRenewal?.stop();
   await input.runCredentialRenewal?.stop();
@@ -8597,10 +8681,14 @@ import {
   ActiveBackendUnresolvableError as ActiveBackendUnresolvableError2,
   CompactionProviderResponseError,
   EmptyCompactionSummaryError,
+  compactionProviderRejection,
+  describeCompactionProviderRejection,
   isMcpRequestTimeoutError,
   isMcpTransportConnectivityError,
   isModalTaskExecStartDnsResolutionError,
   RoutingWorkspaceRootChangedError,
+  SandboxMaterializationVerificationError,
+  materializationVerificationDiagnostic,
   SelfhostedWorkspaceRootChangedError,
   UNKNOWN_MODEL_FINISH_REASON_CODE
 } from "@opengeni/runtime";
@@ -8772,12 +8860,8 @@ function attachmentRefsFromItem(item) {
   }
   return refs;
 }
-function attachmentReceiptText(ref, file) {
-  if (!file) {
-    return `[Earlier attachment: fileId=${ref.fileId}; mountDirectory=${resourceMountPath(ref)}. Use the existing file there, or call files__files_get_download_url with this fileId and download it with the shell.]`;
-  }
-  const path = sandboxFilePath(ref, file);
-  return `[Attachment: ${file.safeFilename}; fileId=${file.id}; type=${file.contentType}; bytes=${file.sizeBytes}; path=${path}. If the local path is absent, call files__files_get_download_url with this fileId and download it with the shell.]`;
+function attachmentReceiptText(ref) {
+  return `[Attachment: fileId=${ref.fileId}; mountDirectory=${resourceMountPath(ref)}. Use the existing file there, or call files__files_get_download_url with this fileId and download it with the shell.]`;
 }
 function createModelHistoryAttachmentProjector(policy, readFileBytes, loadAuthorizedFiles) {
   const contentById = /* @__PURE__ */ new Map();
@@ -8856,7 +8940,7 @@ function createModelHistoryAttachmentProjector(policy, readFileBytes, loadAuthor
         const attachment = currentFile ? contentById.get(ref.fileId) : void 0;
         const receipt = {
           type: "input_text",
-          text: attachmentReceiptText(ref, currentFile)
+          text: attachmentReceiptText(ref)
         };
         if (!attachment || attachment.kind !== "image") {
           return [receipt];
@@ -8875,12 +8959,18 @@ function createModelHistoryAttachmentProjector(policy, readFileBytes, loadAuthor
 }
 function withCurrentUserAttachmentRefs(historyItems, refs) {
   if (refs.length === 0) return historyItems;
+  const retainedIds = new Set(
+    historyItems.flatMap((item) => attachmentRefsFromItem(item).map((ref) => ref.fileId))
+  );
+  const missing = refs.filter((ref) => !retainedIds.has(ref.fileId));
+  if (missing.length === 0) return historyItems;
   for (let index = historyItems.length - 1; index >= 0; index -= 1) {
     const item = historyItems[index];
+    if (item[MODEL_ATTACHMENT_CATALOG_MARKER] === true) continue;
     if (item.type !== "message" || item.role !== "user") continue;
     const existing = attachmentRefsFromItem(item);
     const existingIds = new Set(existing.map((ref) => ref.fileId));
-    const additions = refs.filter((ref) => !existingIds.has(ref.fileId));
+    const additions = missing.filter((ref) => !existingIds.has(ref.fileId));
     if (additions.length === 0) return historyItems;
     const projected = [...historyItems];
     projected[index] = { ...item, [MODEL_ATTACHMENT_REFS_FIELD]: [...existing, ...additions] };
@@ -8950,8 +9040,8 @@ async function turnInput(db, runtime, agent, trigger, options) {
       options
     );
   }
-  if (trigger.type === "system.update.delivered") {
-    if (updates.length === 0) {
+  if (trigger.type === "system.update.delivered" || trigger.type === "session.context.compaction.requested") {
+    if (trigger.type === "system.update.delivered" && updates.length === 0) {
       throw new Error("Internal update inference has no delivered updates");
     }
     return await messageInput(
@@ -9117,6 +9207,7 @@ function sandboxFilePath(resource, file) {
 // src/activities/agent-turn/errors.ts
 import {
   CodexReloginRequired,
+  classifyCodexEncryptedArtifactRejection,
   classifyCodexResponseTimeoutError,
   classifyCodexUsageLimitError,
   isCodexTransportError
@@ -9242,9 +9333,15 @@ function escapedMcpTimeoutRecoveryFailure(input) {
 function preClaimAdmissionFailure(error) {
   const persistenceFailure = isSessionEventPersistenceError(error) ? error : null;
   const retryableCode = retryableDatabaseFailureCode(error);
+  const rejectedClaim = persistenceFailure?.details.stage === "session_attempts.claim" && persistenceFailure.details.retryOutcome === "not_retryable" && !retryableCode;
   const detail = {
-    disposition: persistenceFailure || retryableCode ? "retryable" : "permanent",
-    code: retryableCode ?? persistenceFailure?.details.code ?? "claim_invariant"
+    disposition: rejectedClaim ? "blocked" : persistenceFailure || retryableCode ? "retryable" : "permanent",
+    code: retryableCode ?? persistenceFailure?.details.code ?? "claim_invariant",
+    ...persistenceFailure && rejectedClaim ? {
+      sqlState: persistenceFailure.details.sqlState,
+      reason: persistenceFailure.details.stage === "session_attempts.claim" && persistenceFailure.details.sqlState === "OG001" ? "initiator_membership_required" : persistenceFailure.details.stage === "session_attempts.claim" && persistenceFailure.details.sqlState === "OG002" ? "personal_resource_grant_required" : "database_claim_rejected",
+      retryPolicy: "explicit_recheck"
+    } : {}
   };
   return ApplicationFailure.create({
     message: PRE_CLAIM_FAILURE_MESSAGE,
@@ -9384,19 +9481,38 @@ function safeErrorForTelemetry(error) {
   safe.origin = diagnostic.origin;
   return safe;
 }
+var COMPACTION_PROVIDER_REJECTION_GUIDANCE = "The provider refused this exact request, so repeating it fails the same way until the conversation changes. If a new message fails again, start a new session.";
 function compactionFailureReasonFromError(error) {
+  const rejection = compactionProviderRejection(error);
+  if (rejection) {
+    return compactionFailureReason(
+      `the model provider rejected the compaction request (${describeCompactionProviderRejection(rejection)}). Active history was preserved. ${COMPACTION_PROVIDER_REJECTION_GUIDANCE}`
+    );
+  }
   if (error instanceof CompactionProviderResponseError || error instanceof EmptyCompactionSummaryError) {
     return compactionFailureReason(error.message);
   }
   const errorName = error instanceof Error && error.name ? error.name : "unknown error";
   return compactionFailureReason(`unexpected ${errorName}`);
 }
+function compactionFailureTurnEventPayload(error, overrides = {}) {
+  const rejection = compactionProviderRejection(error);
+  return {
+    error: overrides.error ?? compactionFailureReasonFromError(error),
+    code: "context_compaction_failed",
+    retryable: false,
+    recovery: "user_message",
+    compacted: false,
+    ...rejection ? { providerRejection: rejection } : {}
+  };
+}
 function isCompactionSummaryFailure(error) {
   return error instanceof CompactionProviderResponseError || error instanceof EmptyCompactionSummaryError;
 }
 function shouldRecoverCompactionProviderFailure(error) {
   if (!(error instanceof CompactionProviderResponseError)) return false;
   if (isCodexTransportError(error) && classifyCodexUsageLimitError(error)) return true;
+  if (classifyCodexEncryptedArtifactRejection(error)) return true;
   return agentRunFailurePayload(error).retryable === true;
 }
 function classifyContextWindowOverflowError(error) {
@@ -9546,6 +9662,19 @@ function findPostgresDriverError(error) {
   return null;
 }
 function agentRunFailurePayload(error, options = {}) {
+  const failure = baseAgentRunFailurePayload(error, options);
+  const diagnostic = materializationVerificationDiagnostic(error);
+  return diagnostic ? { ...failure, materializationDiagnostic: diagnostic } : failure;
+}
+function baseAgentRunFailurePayload(error, options = {}) {
+  if (error instanceof SandboxMaterializationVerificationError) {
+    return {
+      error: error.message,
+      code: error.code,
+      retryable: false,
+      materializationDiagnostic: error.diagnostic
+    };
+  }
   if (error instanceof RetainedAttachmentTransportLimitError) {
     return { error: error.message, code: "retained_attachment_transport_limit", retryable: false };
   }
@@ -9846,12 +9975,11 @@ export {
   withFirstPartyTools,
   createKnowledgeSourceSyncActivities,
   rigProviderImageSourceImage,
-  settingsWithPackSandboxImage,
-  resolveWorkspacePackRuntime,
   createRuntimeBatcher,
   currentActivityContext,
   startActivityHeartbeat,
   nextStreamEvent,
+  warnDrainSnapshotFailure,
   persistWorkspaceArchiveCandidate,
   putVersion1TarArchiveOrInline,
   sandboxLeaseHolderIdForAttempt,
@@ -9925,6 +10053,7 @@ export {
   safeErrorDiagnostic,
   safeErrorForTelemetry,
   compactionFailureReasonFromError,
+  compactionFailureTurnEventPayload,
   isCompactionSummaryFailure,
   shouldRecoverCompactionProviderFailure,
   classifyContextWindowOverflowError,
@@ -9935,4 +10064,4 @@ export {
   codexUsageLimitFailurePayload,
   CODEX_USAGE_LIMIT_MAX_RESUME_MS
 };
-//# sourceMappingURL=chunk-CYITU5UH.js.map
+//# sourceMappingURL=chunk-TVEE2UUC.js.map