@opengeni/db 4.3.2-canary.0 → 4.3.2

package/dist/index.d.ts

@@ -8112,13 +8112,6 @@ export type LegacyModalCheckpointAdoptionTarget = Omit<LegacyModalCheckpointSlot
  * an unreferenced candidate that GC might delete while the legacy slot still
  * depends on that provider object. */
 export declare function adoptLegacyModalCheckpointArtifact(db: Database, input: LegacyModalCheckpointAdoptionTarget): Promise<boolean>;
-/** Object-candidate outcome from the publication transaction, independent of
- * lifecycle `wrote`. Absent for inline/provider receipts and pure CAS checks.
- * `unused` is NOT a retirement receipt: only the owner of a fresh candidate with
- * no other publication in flight may use it for immediate cleanup. Exceptions
- * give no disposition (commit may have happened). Legacy/shared keys and evicted
- * refs need durable no-reattachment evidence before deletion. */
-export type WorkspaceArchiveCandidateDisposition = "adopted" | "already_referenced" | "unused";
 export declare function persistDrainSnapshot(db: Database, input: {
     accountId: string;
     workspaceId: string;
@@ -8149,7 +8142,6 @@ export declare function persistDrainSnapshot(db: Database, input: {
 })): Promise<{
     wrote: boolean;
     archiveRevision: string | null;
-    candidateDisposition?: WorkspaceArchiveCandidateDisposition;
 }>;
 /**
  * The ONE archive-fold write, shared by the drain seam (persistDrainSnapshot)
@@ -8221,7 +8213,6 @@ export declare function persistWarmSnapshot(db: Database, input: {
     throttled: boolean;
     superseded: boolean;
     archiveRevision: string | null;
-    candidateDisposition?: WorkspaceArchiveCandidateDisposition;
 }>;
 export declare function getMaterializedSandboxFileResources(db: Database, input: {
     accountId: string;

package/dist/index.js

@@ -9207,7 +9207,6 @@ import {
   SANDBOX_PROVIDER_INSTANCE_ID_FIELDS_BY_BACKEND,
   parseWorkspaceArchiveDescriptor,
   parseWorkspaceArchiveObjectRef,
-  validateWorkspaceArchiveObjectRef,
   workspaceArchivePayloadPresent,
   omitInlineWorkspaceArchiveWhenObjectRefPresent,
   stableJson as stableJson16,
@@ -76188,17 +76187,7 @@ async function adoptLegacyModalCheckpointArtifact(db, input) {
   );
 }
 function publishedWorkspaceArchiveFields(input) {
-  const ref = input.workspaceArchiveRef == null ? void 0 : validateWorkspaceArchiveObjectRef(input.workspaceArchiveRef, {
-    accountId: input.accountId,
-    workspaceId: input.workspaceId,
-    sandboxGroupId: input.sandboxGroupId,
-    descriptor: input.workspaceArchiveMeta
-  }) ?? void 0;
-  if (input.workspaceArchiveRef != null && !ref) {
-    throw new Error(
-      "Invalid workspace archive object ref: publication scope or descriptor mismatch"
-    );
-  }
+  const ref = parseWorkspaceArchiveObjectRef(input.workspaceArchiveRef) ?? void 0;
   const inline = typeof input.workspaceArchive === "string" && input.workspaceArchive.length > 0 ? input.workspaceArchive : void 0;
   if (!ref && !inline) {
     throw new Error("workspace archive publication requires inline bytes or an object ref");
@@ -76215,24 +76204,11 @@ function publishedWorkspaceArchiveFields(input) {
   }
   return { workspaceArchive: inline };
 }
-function workspaceArchiveCandidateFields(candidate, lockedResumeState) {
-  if (!candidate) return {};
-  const sessionState = lockedResumeState?.sessionState;
-  const referenced = [
-    sessionState?.workspaceArchiveRef,
-    sessionState?.workspaceArchivePrevRef
-  ].some((value) => {
-    const ref = parseWorkspaceArchiveObjectRef(value);
-    return ref?.key === candidate.key && ref.backend === candidate.backend;
-  });
-  return { candidateDisposition: referenced ? "already_referenced" : "unused" };
-}
 async function persistDrainSnapshot(db, input) {
   const workspaceArchiveMeta = input.workspaceArchive === null ? null : parseArchiveRevision(input.workspaceArchiveMeta);
   if (input.workspaceArchive !== null && !workspaceArchiveMeta) {
     throw new Error("Invalid verified workspace archive descriptor");
   }
-  const published = input.workspaceArchive === null ? null : publishedWorkspaceArchiveFields(input);
   if (workspaceArchiveMeta?.version === 2 && (workspaceArchiveMeta.provider === "modal_snapshot_filesystem" || workspaceArchiveMeta.provider === "modal_snapshot_directory") && !input.checkpointArtifactId) {
     throw new Error("Modal native checkpoint publication requires a registered artifact");
   }
@@ -76270,15 +76246,10 @@ async function persistDrainSnapshot(db, input) {
         for update
       `);
       const row = guard[0];
-      const candidateFields = workspaceArchiveCandidateFields(
-        published?.workspaceArchiveRef,
-        row?.resume_state
-      );
       if (!row) {
         return {
           wrote: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       const sourceLeaseMatches = input.expectedLeaseId === void 0 || row.id === input.expectedLeaseId;
@@ -76288,7 +76259,7 @@ async function persistDrainSnapshot(db, input) {
       const lateReceipt = recovery.lateArchiveCapture;
       const coldLatePublication = input.workspaceArchive !== null && input.expectedLeaseId !== void 0 && input.providerRequestId !== void 0 && row.id === input.expectedLeaseId && row.liveness === "cold" && Number(row.refcount) === 0 && Number(row.lease_epoch) === input.expectedEpoch + 1 && row.instance_id === null && Number(row.workspace_generation) === input.expectedWorkspaceGeneration && row.archive_capture_id === null && recovery.provider.status === "missing" && recovery.provider.instanceId === input.expectedInstanceId && recovery.restore.rematerializationId === null && (recovery.restore.status === "unrecoverable" || recovery.restore.status === "degraded" || recovery.restore.status === "pending") && lateReceipt?.sourceLeaseId === input.expectedLeaseId && lateReceipt.sourceLeaseEpoch === input.expectedEpoch && lateReceipt.sourceInstanceId === input.expectedInstanceId && lateReceipt.sourceWorkspaceGeneration === input.expectedWorkspaceGeneration && lateReceipt.providerRequestId === input.providerRequestId && !row.unsettled_mutation;
       if (!activePublication && !coldLatePublication) {
-        return { wrote: false, archiveRevision: null, ...candidateFields };
+        return { wrote: false, archiveRevision: null };
       }
       const priorArchive = row.prior_archive ?? null;
       const priorArchivePrev = row.prior_archive_prev ?? null;
@@ -76300,7 +76271,7 @@ async function persistDrainSnapshot(db, input) {
           archiveRevision: null
         };
       }
-      if (!published) throw new Error("Missing workspace archive publication fields");
+      const published = publishedWorkspaceArchiveFields(input);
       const priorMeta = parseArchiveRevision(priorSessionState?.workspaceArchiveMeta);
       if (activePublication && row.archive_capture_published_at !== null) {
         if (priorArchive === null && priorRef === null || priorMeta === null) {
@@ -76320,7 +76291,7 @@ async function persistDrainSnapshot(db, input) {
               )
           `);
         }
-        return { wrote: true, archiveRevision: priorMeta.revision, ...candidateFields };
+        return { wrote: true, archiveRevision: priorMeta.revision };
       }
       const rotation = rotateWorkspaceArchives({
         resumeState: row.resume_state,
@@ -76374,14 +76345,12 @@ async function persistDrainSnapshot(db, input) {
       if (!folded) {
         return {
           wrote: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       return {
         wrote: true,
-        archiveRevision: workspaceArchiveMeta?.revision ?? null,
-        ...published.workspaceArchiveRef ? { candidateDisposition: "adopted" } : {}
+        archiveRevision: workspaceArchiveMeta?.revision ?? null
       };
     }
   );
@@ -76658,27 +76627,12 @@ async function persistWarmSnapshot(db, input) {
         )
       ).limit(1) : [];
       const attemptMayPersistWorkspace = attempt !== void 0 && (attempt.state === "claimed" || attempt.state === "running" ? attempt.outcome === null : attempt.state === "closed" && (attempt.outcome === "completed" || attempt.outcome === "failed" || attempt.outcome === "requires_action"));
-      const candidateLease = published.workspaceArchiveRef ? await scopedDb.execute(sql81`
-            select jsonb_build_object('sessionState', jsonb_build_object(
-              'workspaceArchiveRef', resume_state #> '{sessionState,workspaceArchiveRef}',
-              'workspaceArchivePrevRef', resume_state #> '{sessionState,workspaceArchivePrevRef}'
-            )) as resume_state
-            from sandbox_leases
-            where workspace_id = ${input.workspaceId}
-              and sandbox_group_id = ${input.sandboxGroupId}
-            for update
-          `) : [];
-      const candidateFields = workspaceArchiveCandidateFields(
-        published.workspaceArchiveRef,
-        candidateLease[0]?.resume_state
-      );
       if (!attempt || attempt.accountId !== input.accountId || attempt.sandboxGroupId !== input.sandboxGroupId || interruption || !attemptMayPersistWorkspace) {
         return {
           wrote: false,
           throttled: false,
           superseded: true,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       const guard = await scopedDb.execute(sql81`
@@ -76726,8 +76680,7 @@ async function persistWarmSnapshot(db, input) {
           wrote: false,
           throttled: false,
           superseded: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       const priorArchive = guard[0].prior_archive ?? null;
@@ -76740,8 +76693,7 @@ async function persistWarmSnapshot(db, input) {
           wrote: false,
           throttled: false,
           superseded: true,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       if (input.minIntervalMs > 0 && Number.isFinite(priorAtMs) && capturedAtMs - priorAtMs < input.minIntervalMs) {
@@ -76749,8 +76701,7 @@ async function persistWarmSnapshot(db, input) {
           wrote: false,
           throttled: true,
           superseded: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       const rotation = rotateWorkspaceArchives({
@@ -76771,8 +76722,7 @@ async function persistWarmSnapshot(db, input) {
           wrote: false,
           throttled: false,
           superseded: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       const livenessGuard = rowLiveness;
@@ -76802,16 +76752,14 @@ async function persistWarmSnapshot(db, input) {
           wrote: false,
           throttled: false,
           superseded: false,
-          archiveRevision: null,
-          ...candidateFields
+          archiveRevision: null
         };
       }
       return {
         wrote: true,
         throttled: false,
         superseded: false,
-        archiveRevision: workspaceArchiveMeta.revision,
-        ...published.workspaceArchiveRef ? { candidateDisposition: "adopted" } : {}
+        archiveRevision: workspaceArchiveMeta.revision
       };
     }
   );