@opengeni/db 3.7.4-canary.0 → 3.8.2-canary.0

package/src/insights-model-bundle.ts

@@ -116,6 +116,8 @@ function mapModelRows(value: unknown, label: string): ModelCallFactAggregateRow[
     pricedCostMicros: numberValue(row, "pricedCostMicros"),
     estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
     estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+    equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+    equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
   }));
 }
 
@@ -126,6 +128,8 @@ function mapRootRows(value: unknown, label: string): RootSessionDriverRow[] {
     pricedCostMicros: numberValue(row, "pricedCostMicros"),
     estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
     estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+    equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+    equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
     totalTokens: numberValue(row, "totalTokens"),
     cachedTokens: numberValue(row, "cachedTokens"),
     cacheInputTokens: numberValue(row, "cacheInputTokens"),
@@ -153,6 +157,8 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
           costMicros: numberValue(row, "costMicros"),
           estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
           estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+          equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+          equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
           inputTokens: numberValue(row, "inputTokens"),
           outputTokens: numberValue(row, "outputTokens"),
           cachedTokens: numberValue(row, "cachedTokens"),
@@ -173,6 +179,8 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
       pricedCostMicros: numberValue(row, "pricedCostMicros"),
       estimatedProviderCostMicros: numberValue(row, "estimatedProviderCostMicros"),
       estimatedProviderCostKnownCalls: numberValue(row, "estimatedProviderCostKnownCalls"),
+      equivalentCreditCostMicros: numberValue(row, "equivalentCreditCostMicros"),
+      equivalentCreditCostKnownCalls: numberValue(row, "equivalentCreditCostKnownCalls"),
       totalTokens: numberValue(row, "totalTokens"),
       cachedTokens: numberValue(row, "cachedTokens"),
       cacheInputTokens: numberValue(row, "cacheInputTokens"),
@@ -203,6 +211,7 @@ function mapBundle(value: unknown): WorkspaceInsightsModelBundle {
       totalTokens: nullableNumber(row, "totalTokens"),
       pricedCostMicros: numberValue(row, "pricedCostMicros"),
       estimatedProviderCostMicros: nullableNumber(row, "estimatedProviderCostMicros"),
+      equivalentCreditCostMicros: nullableNumber(row, "equivalentCreditCostMicros"),
       pricingSource: nullableString(row, "pricingSource"),
     })),
     promptContributions: {
@@ -261,6 +270,7 @@ export async function readWorkspaceInsightsModelBundle(
           fact.total_tokens,
           fact.priced_cost_micros,
           fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros,
           fact.pricing_source,
           fact.context_contributions,
           fact.occurred_at,
@@ -286,7 +296,8 @@ export async function readWorkspaceInsightsModelBundle(
           fact.reasoning_tokens,
           fact.total_tokens,
           fact.priced_cost_micros,
-          fact.estimated_provider_cost_micros
+          fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros
         from opengeni_private.visible_workspace_insights_model_call_facts(
           ${input.workspaceId},
           ${input.priorSince.toISOString()}::timestamp with time zone,
@@ -340,7 +351,11 @@ export async function readWorkspaceInsightsModelBundle(
           coalesce(sum(fact.estimated_provider_cost_micros), 0)::bigint
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
-            as estimated_provider_cost_known_calls
+            as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls
         from current_visible fact
         group by fact.provider, fact.model, fact.billing_path
       ), prior_model_rows as (
@@ -368,7 +383,11 @@ export async function readWorkspaceInsightsModelBundle(
           coalesce(sum(fact.estimated_provider_cost_micros), 0)::bigint
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
-            as estimated_provider_cost_known_calls
+            as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls
         from prior_visible fact
         group by fact.provider, fact.model, fact.billing_path
       ), current_series_rows as (
@@ -381,6 +400,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.input_tokens), 0)::bigint as input_tokens,
           coalesce(sum(fact.output_tokens), 0)::bigint as output_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
@@ -408,6 +431,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -433,6 +460,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -454,6 +485,10 @@ export async function readWorkspaceInsightsModelBundle(
             as estimated_provider_cost_micros,
           count(fact.estimated_provider_cost_micros)::bigint
             as estimated_provider_cost_known_calls,
+          coalesce(sum(fact.equivalent_credit_cost_micros), 0)::bigint
+            as equivalent_credit_cost_micros,
+          count(fact.equivalent_credit_cost_micros)::bigint
+            as equivalent_credit_cost_known_calls,
           coalesce(sum(fact.total_tokens), 0)::bigint as total_tokens,
           coalesce(sum(fact.cached_tokens), 0)::bigint as cached_tokens,
           coalesce(sum(fact.input_tokens) filter (
@@ -491,6 +526,7 @@ export async function readWorkspaceInsightsModelBundle(
           fact.total_tokens,
           fact.priced_cost_micros,
           fact.estimated_provider_cost_micros,
+          fact.equivalent_credit_cost_micros,
           fact.pricing_source
         from current_visible fact
         left join selected_sessions session
@@ -539,7 +575,9 @@ export async function readWorkspaceInsightsModelBundle(
             'cacheKnownCalls', cache_known_calls,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
-            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls
+            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls
           ) order by provider, model, billing_path)
           from current_model_rows
         ), '[]'::jsonb),
@@ -560,7 +598,9 @@ export async function readWorkspaceInsightsModelBundle(
             'cacheKnownCalls', cache_known_calls,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
-            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls
+            'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls
           ) order by provider, model, billing_path)
           from prior_model_rows
         ), '[]'::jsonb),
@@ -570,6 +610,8 @@ export async function readWorkspaceInsightsModelBundle(
             'costMicros', cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'inputTokens', input_tokens,
             'outputTokens', output_tokens,
             'cachedTokens', cached_tokens,
@@ -590,6 +632,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens
@@ -603,6 +647,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens
@@ -615,6 +661,8 @@ export async function readWorkspaceInsightsModelBundle(
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
             'estimatedProviderCostKnownCalls', estimated_provider_cost_known_calls,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
+            'equivalentCreditCostKnownCalls', equivalent_credit_cost_known_calls,
             'totalTokens', total_tokens,
             'cachedTokens', cached_tokens,
             'cacheInputTokens', cache_input_tokens,
@@ -651,6 +699,7 @@ export async function readWorkspaceInsightsModelBundle(
             'totalTokens', total_tokens,
             'pricedCostMicros', priced_cost_micros,
             'estimatedProviderCostMicros', estimated_provider_cost_micros,
+            'equivalentCreditCostMicros', equivalent_credit_cost_micros,
             'pricingSource', pricing_source
           ) order by occurred_at desc, id desc)
           from recent_rows

package/src/insights.ts

@@ -29,6 +29,8 @@ export type ModelCallFactAggregateRow = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
 };
 
 export type InsightsDayBucket = {
@@ -60,6 +62,8 @@ export type RootSessionDriverRow = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   totalTokens: number;
   cachedTokens: number;
   cacheInputTokens: number;
@@ -70,6 +74,8 @@ export type ScheduleFactAggregate = {
   pricedCostMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   totalTokens: number;
   cachedTokens: number;
   cacheInputTokens: number;
@@ -134,6 +140,7 @@ export type RecentModelCallRow = {
   totalTokens: number | null;
   pricedCostMicros: number;
   estimatedProviderCostMicros: number | null;
+  equivalentCreditCostMicros: number | null;
   pricingSource: string | null;
 };
 
@@ -360,6 +367,8 @@ export async function aggregateModelCallFacts(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
       })
       .from(source)
       .where(and(...clauses))
@@ -381,6 +390,8 @@ export async function aggregateModelCallFacts(
       pricedCostMicros: Number(row.pricedCostMicros),
       estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
       estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+      equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+      equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
     }));
   });
 }
@@ -389,6 +400,8 @@ export type ModelCallFactSeriesAggregate = {
   costMicros: number;
   estimatedProviderCostMicros: number;
   estimatedProviderCostKnownCalls: number;
+  equivalentCreditCostMicros: number;
+  equivalentCreditCostKnownCalls: number;
   inputTokens: number;
   outputTokens: number;
   cachedTokens: number;
@@ -436,6 +449,8 @@ async function aggregateModelCallFactsByBucket(
         costMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         inputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}), 0)`,
         outputTokens: sql<number>`coalesce(sum(${modelCallFacts.outputTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
@@ -457,6 +472,8 @@ async function aggregateModelCallFactsByBucket(
           costMicros: Number(row.costMicros),
           estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
           estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+          equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+          equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
           inputTokens: Number(row.inputTokens),
           outputTokens: Number(row.outputTokens),
           cachedTokens: Number(row.cachedTokens),
@@ -630,6 +647,8 @@ export async function aggregateRootSessionDrivers(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         totalTokens: sql<number>`coalesce(sum(${modelCallFacts.totalTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
         cacheInputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}) filter (where ${modelCallFacts.cachedTokens} is not null and ${modelCallFacts.inputTokens} is not null), 0)`,
@@ -659,6 +678,8 @@ export async function aggregateRootSessionDrivers(
       pricedCostMicros: Number(row.pricedCostMicros),
       estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
       estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+      equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+      equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
       totalTokens: Number(row.totalTokens),
       cachedTokens: Number(row.cachedTokens),
       cacheInputTokens: Number(row.cacheInputTokens),
@@ -735,6 +756,9 @@ export async function listRecentModelCalls(
         estimatedProviderCostMicros: sql<
           number | null
         >`${modelCallFacts.estimatedProviderCostMicros}`,
+        equivalentCreditCostMicros: sql<
+          number | null
+        >`${modelCallFacts.equivalentCreditCostMicros}`,
         pricingSource: sql<string | null>`${modelCallFacts.pricingSource}`,
       })
       .from(source)
@@ -763,6 +787,10 @@ export async function listRecentModelCalls(
         row.estimatedProviderCostMicros,
         "estimated provider cost",
       ),
+      equivalentCreditCostMicros: insightsNullableNumber(
+        row.equivalentCreditCostMicros,
+        "equivalent credit cost",
+      ),
     }));
   });
 }
@@ -886,6 +914,8 @@ export async function aggregateScheduleFacts(
         pricedCostMicros: sql<number>`coalesce(sum(${modelCallFacts.pricedCostMicros}) filter (where ${modelCallFacts.billingPath} = 'opengeni_credits'), 0)`,
         estimatedProviderCostMicros: sql<number>`coalesce(sum(${modelCallFacts.estimatedProviderCostMicros}), 0)`,
         estimatedProviderCostKnownCalls: sql<number>`count(${modelCallFacts.estimatedProviderCostMicros})::int`,
+        equivalentCreditCostMicros: sql<number>`coalesce(sum(${modelCallFacts.equivalentCreditCostMicros}), 0)`,
+        equivalentCreditCostKnownCalls: sql<number>`count(${modelCallFacts.equivalentCreditCostMicros})::int`,
         totalTokens: sql<number>`coalesce(sum(${modelCallFacts.totalTokens}), 0)`,
         cachedTokens: sql<number>`coalesce(sum(${modelCallFacts.cachedTokens}), 0)`,
         cacheInputTokens: sql<number>`coalesce(sum(${modelCallFacts.inputTokens}) filter (where ${modelCallFacts.cachedTokens} is not null and ${modelCallFacts.inputTokens} is not null), 0)`,
@@ -906,6 +936,8 @@ export async function aggregateScheduleFacts(
         pricedCostMicros: Number(row.pricedCostMicros),
         estimatedProviderCostMicros: Number(row.estimatedProviderCostMicros),
         estimatedProviderCostKnownCalls: Number(row.estimatedProviderCostKnownCalls),
+        equivalentCreditCostMicros: Number(row.equivalentCreditCostMicros),
+        equivalentCreditCostKnownCalls: Number(row.equivalentCreditCostKnownCalls),
         totalTokens: Number(row.totalTokens),
         cachedTokens: Number(row.cachedTokens),
         cacheInputTokens: Number(row.cacheInputTokens),

package/src/new-session-drafts.ts

@@ -357,23 +357,10 @@ export async function rememberNewSessionSelectionInTransaction(
   return Boolean(updated);
 }
 
-/**
- * Replace one exact accepted draft with the next-create safe seed. The row is
- * identity-serialized before the revision check so even the absent-row
- * revision-zero case cannot race a first save. Exact create callers receive a
- * typed conflict; legacy revision-only callers retain the old false/no-op
- * result. A missing row is an idempotent no-op.
- */
-export async function seedNewSessionDraftInTransaction(
+async function lockCurrentNewSessionDraft(
   db: Database,
-  input: {
-    workspaceId: string;
-    subjectId: string;
-    expectedRevision: number;
-    expectedSnapshot?: NewSessionDraftSnapshot;
-    acceptedSelection?: AcceptedNewSessionSelection;
-  },
-): Promise<boolean> {
+  input: { workspaceId: string; subjectId: string },
+): Promise<NewSessionDraftRow | undefined> {
   await lockNewSessionDraftIdentity(db, input.workspaceId, input.subjectId);
   const [current] = await db
     .select()
@@ -386,14 +373,23 @@ export async function seedNewSessionDraftInTransaction(
     )
     .for("update")
     .limit(1);
+  return current;
+}
+
+async function lockExactNewSessionDraft(
+  db: Database,
+  input: {
+    workspaceId: string;
+    subjectId: string;
+    expectedRevision: number;
+    expectedSnapshot: NewSessionDraftSnapshot;
+  },
+): Promise<NewSessionDraftRow> {
+  const current = await lockCurrentNewSessionDraft(db, input);
   if (!current || current.revision !== input.expectedRevision) {
-    if (input.expectedSnapshot) {
-      throw new NewSessionDraftConflictError(current?.revision ?? 0);
-    }
-    return false;
+    throw new NewSessionDraftConflictError(current?.revision ?? 0);
   }
   if (
-    input.expectedSnapshot &&
     stableJson({
       text: current.text,
       resources: current.resources,
@@ -407,6 +403,55 @@ export async function seedNewSessionDraftInTransaction(
   ) {
     throw new NewSessionDraftConflictError(current.revision);
   }
+  return current;
+}
+
+/**
+ * Fence a fresh session shell on the exact actor-private draft it represents.
+ * The caller keeps this row lock through its create transaction, so a draft
+ * that was already stale cannot leave a committed, uninitialized session.
+ * The later atomic initializer still performs the authoritative consume.
+ */
+export async function assertExactNewSessionDraftInTransaction(
+  db: Database,
+  input: {
+    workspaceId: string;
+    subjectId: string;
+    expectedRevision: number;
+    expectedSnapshot: NewSessionDraftSnapshot;
+  },
+): Promise<void> {
+  await lockExactNewSessionDraft(db, input);
+}
+
+/**
+ * Replace one exact accepted draft with the next-create safe seed. The row is
+ * identity-serialized before the revision check so even the absent-row
+ * revision-zero case cannot race a first save. Exact create callers receive a
+ * typed conflict; legacy revision-only callers retain the old false/no-op
+ * result. A missing row is an idempotent no-op.
+ */
+export async function seedNewSessionDraftInTransaction(
+  db: Database,
+  input: {
+    workspaceId: string;
+    subjectId: string;
+    expectedRevision: number;
+    expectedSnapshot?: NewSessionDraftSnapshot;
+    acceptedSelection?: AcceptedNewSessionSelection;
+  },
+): Promise<boolean> {
+  const current = input.expectedSnapshot
+    ? await lockExactNewSessionDraft(db, {
+        workspaceId: input.workspaceId,
+        subjectId: input.subjectId,
+        expectedRevision: input.expectedRevision,
+        expectedSnapshot: input.expectedSnapshot,
+      })
+    : await lockCurrentNewSessionDraft(db, input);
+  if (!current || current.revision !== input.expectedRevision) {
+    return false;
+  }
 
   const parsedOptions = NewSessionDraftOptions.safeParse(publicNewSessionDraftOptions(current));
   const options = parsedOptions.success ? parsedOptions.data : {};

package/src/organization-membership-lifecycle.ts

@@ -1,4 +1,5 @@
 import {
+  CreateAdditionalOrganizationResponse,
   CreateOrganizationResponse,
   ListOrganizationAdministrationMembersResponse,
   ListOrganizationInvitationsResponse,
@@ -18,6 +19,7 @@ import {
   OrganizationRetentionPolicy,
   OrganizationSummary,
   RevokeOrganizationWorkspaceMemberResponse,
+  type CreateAdditionalOrganizationResponse as CreateAdditionalOrganizationResponseType,
   type CreateOrganizationResponse as CreateOrganizationResponseType,
   type OrganizationAdministrationMember as OrganizationAdministrationMemberType,
   type OrganizationAdministrationOverview as OrganizationAdministrationOverviewType,
@@ -74,6 +76,32 @@ export async function createManagedOrganization(
   });
 }
 
+export async function createAdditionalManagedOrganization(
+  db: Database,
+  input: {
+    subjectId: string;
+    subjectLabel: string;
+    name: string;
+    workspaceName: string;
+    operationId: string;
+  },
+): Promise<CreateAdditionalOrganizationResponseType> {
+  return await db.transaction(async (tx) => {
+    await setSubjectRlsContext(tx as unknown as Database, input.subjectId);
+    const [row] = await rawRows<{ result: unknown }>(
+      tx,
+      sql`select create_additional_managed_organization(
+        ${input.subjectId},
+        ${input.subjectLabel},
+        ${input.name},
+        ${input.workspaceName},
+        ${input.operationId}::uuid
+      ) as result`,
+    );
+    return CreateAdditionalOrganizationResponse.parse(row?.result);
+  });
+}
+
 /**
  * Bounded replay of one exact organization-lifecycle transaction after a
  * PostgreSQL deadlock abort.
@@ -208,7 +236,10 @@ async function settleOrganizationMembershipProtocols(
   db: Database,
   settlements: OrganizationMembershipProtocolSettlement[],
 ): Promise<void> {
-  const [prior] = await rawRows<{ subject_id: string; initiating_human_subject_id: string }>(
+  const [prior] = await rawRows<{
+    subject_id: string;
+    initiating_human_subject_id: string;
+  }>(
     db,
     sql`select
       coalesce(current_setting('opengeni.subject_id', true), '') as subject_id,
@@ -436,7 +467,9 @@ async function runOrganizationWorkspaceCommand(
     { accountId: command.organizationId, workspaceId: null },
     async (scopedDb) => {
       await setSubjectRlsContext(scopedDb, command.actorSubjectId);
-      const [row] = await rawRows<{ result: OrganizationWorkspaceCommandResult }>(
+      const [row] = await rawRows<{
+        result: OrganizationWorkspaceCommandResult;
+      }>(
         scopedDb,
         sql`select organization_workspace_command(${JSON.stringify(command)}::jsonb) as result`,
       );
@@ -455,7 +488,10 @@ export async function createOrganizationWorkspace(
     operationId: string;
   },
 ): Promise<OrganizationWorkspaceAccessType> {
-  const command = await runOrganizationWorkspaceCommand(db, { action: "create", ...input });
+  const command = await runOrganizationWorkspaceCommand(db, {
+    action: "create",
+    ...input,
+  });
   const overview = await getOrganizationAdministrationOverview(db, input);
   const workspace = overview.workspaces.find((candidate) => candidate.id === command.workspaceId);
   if (!workspace) throw new Error("Created organization workspace is missing from its overview");
@@ -615,7 +651,9 @@ export async function assertActiveManagedHumanOrganizationMembership(
   db: Database,
   input: { accountId: string; subjectId: string },
 ): Promise<number | null> {
-  const [row] = await rawRows<{ authorization_revision: number | string | null }>(
+  const [row] = await rawRows<{
+    authorization_revision: number | string | null;
+  }>(
     db,
     sql`select assert_active_managed_human_organization_membership(
       ${input.accountId}::uuid,
@@ -1098,7 +1136,11 @@ export async function previewOrganizationRetentionDeletions(
 
 export async function claimOrganizationRetentionDeletion(
   db: Database,
-  input: { organizationId: string; operationId: string; excludedMembershipIds?: string[] },
+  input: {
+    organizationId: string;
+    operationId: string;
+    excludedMembershipIds?: string[];
+  },
 ): Promise<OrganizationRetentionDeletionClaimType | null> {
   return await runRetentionCapability(db, input.organizationId, async (scopedDb) => {
     const excludedMembershipIds = input.excludedMembershipIds ?? [];