@opengeni/core 6.5.2-canary.41607687019001 → 6.7.0

package/dist/codex-model-availability.d.ts

@@ -2,6 +2,12 @@ import { fetchCodexModels } from "@opengeni/codex";
 import { type Settings } from "@opengeni/config";
 import { listSubscriptionCoreCodexServingConnections, recordSubscriptionCoreCodexModelCatalog, type CodexCredentialTokenSnapshot, type Database } from "@opengeni/db";
 import type { ModelAvailabilityObservation } from "./model-catalog.js";
+/**
+ * How long a display read (picker, page load) waits for a live account list
+ * before it uses the last known one. The live read keeps going and records
+ * its result, so the next read is fresh.
+ */
+export declare const CODEX_CATALOG_DISPLAY_WAIT_MS = 300;
 /** The workspace, organization and acting subject of a Codex catalog read. */
 export type WorkspaceCodexCatalogContext = {
     accountId: string;

package/dist/index.js

@@ -8126,6 +8126,7 @@ import {
   getSessionLineage,
   getSessionTurn,
   getSessionTurnInitiatingHumanSubjectId,
+  sameTurnSender,
   readTurnBillingOrigin as readTurnBillingOrigin2,
   getSessionTurnForAttempt as getSessionTurnForAttempt2,
   getSessionTurnPersonalConnectionDelegations as getSessionTurnPersonalConnectionDelegations2,
@@ -13030,8 +13031,10 @@ import {
   SUBSCRIPTION_MODEL_CATALOG_TTL_MS
 } from "@opengeni/db";
 import { modelServiceTierCatalogEntry } from "@opengeni/contracts";
+import { startChildSpan } from "@opengeni/observability";
 var CATALOG_CACHE_MS = SUBSCRIPTION_MODEL_CATALOG_TTL_MS;
 var CATALOG_ERROR_CACHE_MS = 5e3;
+var CODEX_CATALOG_DISPLAY_WAIT_MS = 300;
 var catalogs = /* @__PURE__ */ new Map();
 var CATALOG_SERVICE_SUBJECT = "service:subscription-core";
 var defaultCatalogDependencies = () => ({
@@ -13161,6 +13164,60 @@ async function loadCoreConnectionCatalog(db, settings, context, connection, deps
     };
   }
 }
+async function readCoreConnectionCatalogForDisplay(db, settings, context, connection, deps, waitMs = CODEX_CATALOG_DISPLAY_WAIT_MS) {
+  const observed = connection.modelCatalog;
+  const now = Date.now();
+  if (observed && observed.observedAt <= now && observed.expiresAt > now) {
+    return {
+      ok: true,
+      slugs: observed.slugs,
+      checkedAt: new Date(observed.observedAt).toISOString(),
+      expiresAt: observed.expiresAt
+    };
+  }
+  const previous = observed && observed.observedAt <= now ? observed : null;
+  const span = startChildSpan(
+    "codex.model_catalog.refresh",
+    { "opengeni.model_catalog.previous": previous ? "expired" : "none" },
+    "internal"
+  );
+  const live = loadCoreConnectionCatalog(db, settings, context, connection, deps);
+  let timer;
+  const settled = await Promise.race([
+    live,
+    new Promise((resolve) => {
+      timer = setTimeout(() => resolve(null), waitMs);
+    })
+  ]);
+  if (timer !== void 0) clearTimeout(timer);
+  if (settled) {
+    span?.end({
+      attributes: {
+        "opengeni.model_catalog.outcome": settled.ok ? "refreshed" : "unavailable"
+      }
+    });
+    return settled;
+  }
+  span?.end({
+    attributes: {
+      "opengeni.model_catalog.outcome": previous ? "served_expired" : "served_unknown"
+    }
+  });
+  if (previous) {
+    return {
+      ok: true,
+      slugs: previous.slugs,
+      checkedAt: new Date(previous.observedAt).toISOString(),
+      expiresAt: previous.expiresAt
+    };
+  }
+  return {
+    ok: false,
+    slugs: [],
+    checkedAt: new Date(now).toISOString(),
+    expiresAt: now + CATALOG_ERROR_CACHE_MS
+  };
+}
 async function refreshCoreCodexModelEntitlements(db, settings, context, deps = defaultCatalogDependencies(), options = {}) {
   const idleExpiry = Date.now() + CATALOG_CACHE_MS;
   const connections = await deps.listServing(db, context);
@@ -13191,7 +13248,7 @@ async function loadWorkspaceCodexCatalogReadiness(db, settings, context, options
   const live = await Promise.all(
     shared.map(async (connection) => ({
       connection,
-      ...await loadCoreConnectionCatalog(db, settings, context, connection, deps)
+      ...await readCoreConnectionCatalogForDisplay(db, settings, context, connection, deps)
     }))
   );
   const observations = {};
@@ -17835,7 +17892,7 @@ async function acceptSessionUserMessageInFileScope(deps, grant, workspaceId, ses
       if (draft2?.revision === input.expectedDraftRevision && draft2.sourceTurnId) {
         const sourceTurn = await getSessionTurn(db, workspaceId, draft2.sourceTurnId);
         if (sourceTurn?.sessionId === sessionId) {
-          frozenAdmissionInitiator = {
+          const sourceInitiator = {
             initiator: sourceTurn.initiator,
             context: sourceTurn.initiatorContext,
             initiatingHumanSubjectId: await getSessionTurnInitiatingHumanSubjectId(
@@ -17844,6 +17901,9 @@ async function acceptSessionUserMessageInFileScope(deps, grant, workspaceId, ses
               sourceTurn.id
             )
           };
+          if (sameTurnSender(sourceInitiator, frozenAdmissionInitiator)) {
+            frozenAdmissionInitiator = sourceInitiator;
+          }
         }
       }
     }
@@ -40800,6 +40860,7 @@ export {
   AZURE_SPEECH_PROVIDER_ID,
   ArchivedSessionImportError2 as ArchivedSessionImportError,
   BYOK_FALLBACK_LIST_RATE,
+  CODEX_CATALOG_DISPLAY_WAIT_MS,
   CONNECTED_MACHINE_CAPABILITY_ID,
   CONVERSATION_ATTACHMENT_MAX_COUNT,
   CONVERSATION_ATTACHMENT_MEDIA_TYPE_MAX_UTF8_BYTES,