@opengeni/db 4.3.2-canary.0 → 4.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/db",
-  "version": "4.3.2-canary.0",
+  "version": "4.3.2",
   "description": "OpenGeni persistence: Drizzle schema, RLS-scoped query layer, the SQL migration runner, and role provisioning.",
   "license": "Apache-2.0",
   "repository": {
@@ -94,11 +94,11 @@
     "prepublishOnly": "bash ../../scripts/prepublish-guard"
   },
   "dependencies": {
-    "@opengeni/codemode": "^0.5.5-canary.0",
-    "@opengeni/codex": "^0.2.22-canary.7",
-    "@opengeni/config": "^1.1.1-canary.0",
-    "@opengeni/contracts": "^3.0.1-canary.0",
-    "@opengeni/network": "^0.3.1-canary.7",
+    "@opengeni/codemode": "^0.5.5",
+    "@opengeni/codex": "^0.2.22",
+    "@opengeni/config": "^1.1.1",
+    "@opengeni/contracts": "^3.0.1",
+    "@opengeni/network": "^0.3.1",
     "drizzle-orm": "^0.45.2",
     "postgres": "^3.4.7"
   },

package/src/index.ts

@@ -272,7 +272,6 @@ import {
   SANDBOX_PROVIDER_INSTANCE_ID_FIELDS_BY_BACKEND,
   parseWorkspaceArchiveDescriptor,
   parseWorkspaceArchiveObjectRef,
-  validateWorkspaceArchiveObjectRef,
   workspaceArchivePayloadPresent,
   omitInlineWorkspaceArchiveWhenObjectRefPresent,
   type WorkspaceArchiveObjectRef,
@@ -53449,30 +53448,13 @@ export async function adoptLegacyModalCheckpointArtifact(
 }
 
 function publishedWorkspaceArchiveFields(input: {
-  accountId: string;
-  workspaceId: string;
-  sandboxGroupId: string;
-  workspaceArchiveMeta: SandboxArchiveRevision;
   workspaceArchive?: string | null;
   workspaceArchiveRef?: WorkspaceArchiveObjectRef | null;
 }): {
   workspaceArchive?: string;
   workspaceArchiveRef?: WorkspaceArchiveObjectRef;
 } {
-  const ref =
-    input.workspaceArchiveRef == null
-      ? undefined
-      : (validateWorkspaceArchiveObjectRef(input.workspaceArchiveRef, {
-          accountId: input.accountId,
-          workspaceId: input.workspaceId,
-          sandboxGroupId: input.sandboxGroupId,
-          descriptor: input.workspaceArchiveMeta,
-        }) ?? undefined);
-  if (input.workspaceArchiveRef != null && !ref) {
-    throw new Error(
-      "Invalid workspace archive object ref: publication scope or descriptor mismatch",
-    );
-  }
+  const ref = parseWorkspaceArchiveObjectRef(input.workspaceArchiveRef) ?? undefined;
   const inline =
     typeof input.workspaceArchive === "string" && input.workspaceArchive.length > 0
       ? input.workspaceArchive
@@ -53493,30 +53475,6 @@ function publishedWorkspaceArchiveFields(input: {
   return { workspaceArchive: inline };
 }
 
-/** 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";
-
-function workspaceArchiveCandidateFields(
-  candidate: WorkspaceArchiveObjectRef | undefined,
-  lockedResumeState: Record<string, unknown> | null | undefined,
-): { candidateDisposition?: WorkspaceArchiveCandidateDisposition } {
-  if (!candidate) return {};
-  const sessionState = lockedResumeState?.sessionState as Record<string, unknown> | undefined;
-  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" };
-}
-
 export async function persistDrainSnapshot(
   db: Database,
   input: {
@@ -53553,14 +53511,12 @@ export async function persistDrainSnapshot(
 ): Promise<{
   wrote: boolean;
   archiveRevision: string | null;
-  candidateDisposition?: WorkspaceArchiveCandidateDisposition;
 }> {
   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" ||
@@ -53619,15 +53575,10 @@ export async function persistDrainSnapshot(
         for update
       `);
       const row = guard[0];
-      const candidateFields = workspaceArchiveCandidateFields(
-        published?.workspaceArchiveRef,
-        row?.resume_state,
-      );
       if (!row) {
         return {
           wrote: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       const sourceLeaseMatches =
@@ -53673,7 +53624,7 @@ export async function persistDrainSnapshot(
         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;
@@ -53691,7 +53642,7 @@ export async function persistDrainSnapshot(
           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) {
         // A predecessor and its successor may receive the same provider result.
@@ -53717,7 +53668,7 @@ export async function persistDrainSnapshot(
               )
           `);
         }
-        return { wrote: true, archiveRevision: priorMeta.revision, ...candidateFields };
+        return { wrote: true, archiveRevision: priorMeta.revision };
       }
       const rotation = rotateWorkspaceArchives({
         resumeState: row.resume_state,
@@ -53778,13 +53729,11 @@ export async function persistDrainSnapshot(
         return {
           wrote: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       return {
         wrote: true,
         archiveRevision: workspaceArchiveMeta?.revision ?? null,
-        ...(published.workspaceArchiveRef ? { candidateDisposition: "adopted" as const } : {}),
       };
     },
   );
@@ -54183,7 +54132,6 @@ export async function persistWarmSnapshot(
   throttled: boolean;
   superseded: boolean;
   archiveRevision: string | null;
-  candidateDisposition?: WorkspaceArchiveCandidateDisposition;
 }> {
   const capturedAtMs = input.capturedAtMs ?? Date.now();
   const workspaceArchiveMeta = parseArchiveRevision(input.workspaceArchiveMeta);
@@ -54253,26 +54201,6 @@ export async function persistWarmSnapshot(
             (attempt.outcome === "completed" ||
               attempt.outcome === "failed" ||
               attempt.outcome === "requires_action"));
-      // Even a replay rejected by the attempt/epoch/capture guards may name
-      // a committed current or previous object. Inspect those slots under the
-      // same lease lock as publication, after the canonical workspace lock.
-      // This conveys no retirement or no-future-reattachment authority.
-      const candidateLease = published.workspaceArchiveRef
-        ? await scopedDb.execute<{ resume_state: Record<string, unknown> | null }>(sql`
-            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 ||
@@ -54285,7 +54213,6 @@ export async function persistWarmSnapshot(
           throttled: false,
           superseded: true,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       const guard = await scopedDb.execute<{
@@ -54343,7 +54270,6 @@ export async function persistWarmSnapshot(
           throttled: false,
           superseded: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       const priorArchive = guard[0]!.prior_archive ?? null;
@@ -54364,7 +54290,6 @@ export async function persistWarmSnapshot(
           throttled: false,
           superseded: true,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       if (
@@ -54377,7 +54302,6 @@ export async function persistWarmSnapshot(
           throttled: true,
           superseded: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       const rotation = rotateWorkspaceArchives({
@@ -54399,7 +54323,6 @@ export async function persistWarmSnapshot(
           throttled: false,
           superseded: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       const livenessGuard: "warm" | "draining" = rowLiveness;
@@ -54432,7 +54355,6 @@ export async function persistWarmSnapshot(
           throttled: false,
           superseded: false,
           archiveRevision: null,
-          ...candidateFields,
         };
       }
       return {
@@ -54440,7 +54362,6 @@ export async function persistWarmSnapshot(
         throttled: false,
         superseded: false,
         archiveRevision: workspaceArchiveMeta.revision,
-        ...(published.workspaceArchiveRef ? { candidateDisposition: "adopted" as const } : {}),
       };
     },
   );