@opengeni/api-router 2.6.3-canary.0 → 2.6.4-canary.0

package/dist/mcp/scheduled-task-view.d.ts

@@ -82,8 +82,8 @@ export declare function scheduledTaskMcpSummary(task: ScheduledTask): {
     runMode: "existing_session" | "new_session_per_run" | "reusable_session";
     overlapPolicy: "allow_concurrent" | "buffer_one" | "skip";
     action: {
+        readonly sourceId?: never;
         kind: "agent_turn";
-        sourceId?: never;
         sourceGeneration?: never;
         sourceLifecycleGeneration?: never;
         destination?: never;
@@ -205,8 +205,8 @@ export declare function boundScheduledTaskDetailMcp(task: ScheduledTask): {
     runMode: "existing_session" | "new_session_per_run" | "reusable_session";
     overlapPolicy: "allow_concurrent" | "buffer_one" | "skip";
     action: {
+        readonly sourceId?: never;
         kind: "agent_turn";
-        sourceId?: never;
         sourceGeneration?: never;
         sourceLifecycleGeneration?: never;
         destination?: never;
@@ -389,8 +389,8 @@ export declare function boundScheduledTaskMcpPage(input: {
         runMode: "existing_session" | "new_session_per_run" | "reusable_session";
         overlapPolicy: "allow_concurrent" | "buffer_one" | "skip";
         action: {
+            readonly sourceId?: never;
             kind: "agent_turn";
-            sourceId?: never;
             sourceGeneration?: never;
             sourceLifecycleGeneration?: never;
             destination?: never;

package/dist/model-catalog.d.ts

@@ -1,23 +1,7 @@
-import { type ConfiguredModel, type Settings } from "@opengeni/config";
-import { ClientModel, type WorkspaceModelCatalogResponse as WorkspaceModelCatalogResponseType, type WorkspaceModelPolicyContract } from "@opengeni/contracts";
-export type ModelAvailabilityObservation = {
-    status: "available" | "degraded" | "unavailable";
-    reason: "not_entitled" | "provider_unhealthy" | null;
-    checkedAt: string;
-};
-export type ModelCredentialReadinessObservation = {
-    status: "ready";
-    checkedAt: string;
-} | {
-    status: "not_ready";
-    reason: "prerequisites_missing" | "needs_reauth";
-    checkedAt: string;
-} | {
-    status: "error";
-    reason: "resolver_error";
-    checkedAt: string;
-};
-export declare const MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS: number;
+import { type ConfiguredModel } from "@opengeni/config";
+import { ClientModel, type WorkspaceModelCatalogResponse as WorkspaceModelCatalogResponseType } from "@opengeni/contracts";
+import { type WorkspaceModelSelectionInput } from "@opengeni/core";
+export { MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS, type ModelAvailabilityObservation, type ModelCredentialReadinessObservation, } from "@opengeni/core";
 /** Static, client-safe definition projection. No provider secret is reachable. */
 export declare function projectClientModel(model: ConfiguredModel): ClientModel;
 /**
@@ -28,14 +12,4 @@ export declare function projectClientModel(model: ConfiguredModel): ClientModel;
  * successful typed resolver observation; credential health and provider health
  * are separate inputs and neither is fabricated.
  */
-export declare function buildWorkspaceModelCatalog(input: {
-    settings: Settings;
-    policy: WorkspaceModelPolicyContract | null;
-    codexSubscriptionActive: boolean;
-    xaiSubscriptionActive?: boolean;
-    workspaceGatewayConnectionActive?: boolean;
-    credentialReadinessObservations?: Readonly<Record<string, ModelCredentialReadinessObservation>> | undefined;
-    observations?: Readonly<Record<string, ModelAvailabilityObservation>> | undefined;
-    now?: Date | undefined;
-    credentialReadinessMaxAgeMs?: number | undefined;
-}): WorkspaceModelCatalogResponseType;
+export declare function buildWorkspaceModelCatalog(input: WorkspaceModelSelectionInput): WorkspaceModelCatalogResponseType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "2.6.3-canary.0",
+  "version": "2.6.4-canary.0",
   "description": "OpenGeni HTTP surface: the Hono adapter/router (createApp), routes, MCP HTTP transport, and HTTP access adapters over @opengeni/core. An engine-distribution surface — its runtime closure includes engine-internal packages.",
   "license": "Apache-2.0",
   "repository": {
@@ -43,23 +43,23 @@
     "@hono/zod-validator": "^0.7.6",
     "@llamaindex/liteparse": "2.14.2",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@opengeni/agent-proto": "^0.5.1-canary.6",
-    "@opengeni/artifact-tool": "^0.3.14-canary.0",
-    "@opengeni/capabilities": "^0.3.1-canary.5",
-    "@opengeni/codemode": "^0.4.22-canary.0",
-    "@opengeni/codex": "^0.2.20-canary.0",
-    "@opengeni/config": "^0.22.5-canary.0",
-    "@opengeni/contracts": "^2.9.2-canary.0",
-    "@opengeni/core": "^2.6.3-canary.0",
-    "@opengeni/db": "^3.7.3-canary.0",
-    "@opengeni/documents": "^0.8.13-canary.0",
-    "@opengeni/events": "^0.4.11-canary.0",
-    "@opengeni/github": "^0.6.7-canary.0",
-    "@opengeni/network": "^0.2.3-canary.5",
-    "@opengeni/observability": "^0.8.14-canary.0",
-    "@opengeni/runtime": "^2.0.1-canary.0",
-    "@opengeni/storage": "^0.2.115-canary.0",
-    "@opengeni/xai-subscription": "^0.1.2-canary.5",
+    "@opengeni/agent-proto": "^0.5.1-canary.7",
+    "@opengeni/artifact-tool": "^0.3.14-canary.1",
+    "@opengeni/capabilities": "^0.3.1-canary.6",
+    "@opengeni/codemode": "^0.4.22-canary.1",
+    "@opengeni/codex": "^0.2.20-canary.1",
+    "@opengeni/config": "^0.22.5-canary.1",
+    "@opengeni/contracts": "^2.9.2-canary.1",
+    "@opengeni/core": "^2.6.4-canary.0",
+    "@opengeni/db": "^3.7.4-canary.0",
+    "@opengeni/documents": "^0.8.14-canary.0",
+    "@opengeni/events": "^0.4.12-canary.0",
+    "@opengeni/github": "^0.6.7-canary.1",
+    "@opengeni/network": "^0.2.3-canary.6",
+    "@opengeni/observability": "^0.8.14-canary.1",
+    "@opengeni/runtime": "^2.0.1-canary.1",
+    "@opengeni/storage": "^0.2.115-canary.1",
+    "@opengeni/xai-subscription": "^0.1.2-canary.6",
     "@temporalio/client": "^1.17.0",
     "better-auth": "^1.6.14",
     "hono": "^4.12.18",

package/src/app.ts

@@ -66,6 +66,8 @@ import {
   requireLiveAgentAttemptAuthorization,
   requirePermission,
   releaseManagedAuthRequestActorLease,
+  resolveCatalogSettings,
+  resolveWorkspaceCatalogSettings,
   validateManagedAuthRequestActorLease,
   requireSessionAuthorization,
   SessionAuthorizationDeniedError,
@@ -222,6 +224,22 @@ export function createApp(deps: AppDependencies): Hono {
   return createAppComposition(deps).app;
 }
 
+export async function resolveWorkspaceMcpRouteDeps(
+  routeDeps: ApiRouteDeps,
+  grant: AccessGrant,
+): Promise<ApiRouteDeps> {
+  const catalogSourceSettings = routeDeps.catalogSourceSettings ?? routeDeps.settings;
+  const resolvedCatalog = await resolveWorkspaceCatalogSettings(
+    routeDeps.db,
+    catalogSourceSettings,
+    {
+      accountId: grant.accountId,
+      workspaceId: grant.workspaceId,
+    },
+  );
+  return { ...routeDeps, catalogSourceSettings, settings: resolvedCatalog.settings };
+}
+
 export function createAppComposition(deps: AppDependencies): {
   app: Hono;
   routeDeps: ApiRouteDeps;
@@ -358,6 +376,7 @@ export function createAppComposition(deps: AppDependencies): {
       : deps.transcriptionSegmenter;
   const routeDeps: ApiRouteDeps = {
     ...deps,
+    resolveCatalogSettings: () => resolveCatalogSettings(deps.db, deps.settings),
     observability,
     githubStateSecret:
       deps.githubStateSecret ?? deps.settings.githubAppManifestStateSecret ?? crypto.randomUUID(),
@@ -766,10 +785,12 @@ export function createAppComposition(deps: AppDependencies): {
 
   app.get("/v1/config/client", async (c) => {
     c.header("cache-control", "no-store");
-    const codexCatalogSettings = deps.settings.codexSubscriptionEnabled
-      ? withCodexCatalogProvider(deps.settings)
-      : deps.settings;
-    const catalogSettings = deps.settings.supergrokSubscriptionEnabled
+    const resolvedCatalog = await resolveCatalogSettings(deps.db, deps.settings);
+    const baseCatalogSettings = resolvedCatalog.settings;
+    const codexCatalogSettings = baseCatalogSettings.codexSubscriptionEnabled
+      ? withCodexCatalogProvider(baseCatalogSettings)
+      : baseCatalogSettings;
+    const catalogSettings = baseCatalogSettings.supergrokSubscriptionEnabled
       ? withXaiSubscriptionCatalogProvider(codexCatalogSettings)
       : codexCatalogSettings;
     return c.json(
@@ -889,7 +910,8 @@ export function createAppComposition(deps: AppDependencies): {
       const transport = new WebStandardStreamableHTTPServerTransport({
         enableJsonResponse: true,
       });
-      const mcp = buildOpenGeniMcpServer(routeDeps, grant, {
+      const mcpDeps = await resolveWorkspaceMcpRouteDeps(routeDeps, grant);
+      const mcp = buildOpenGeniMcpServer(mcpDeps, grant, {
         requestOrigin: new URL(c.req.url).origin,
         workspaceMemoryEnabled,
         workspaceMemoryPromptMode,
@@ -1379,11 +1401,14 @@ type ReadinessCheckResult = { ok: boolean; error?: string };
 function readinessChecks(deps: AppDependencies): ReadinessChecks {
   const configuredNatsCheck = deps.readinessChecks?.nats;
   return {
-    db:
-      deps.readinessChecks?.db ??
-      (async () => {
+    db: async () => {
+      if (deps.readinessChecks?.db) {
+        await deps.readinessChecks.db();
+      } else {
         await deps.db.execute(dbSql`select 1`);
-      }),
+      }
+      await resolveCatalogSettings(deps.db, deps.settings);
+    },
     nats: async () => {
       requireSessionEventDurableFanoutCapability(deps.bus);
       if (configuredNatsCheck) {

package/src/index.ts

@@ -28,7 +28,10 @@ import {
 } from "@opengeni/observability";
 import { createObjectStorage } from "@opengeni/storage";
 import { isArtifactRuntimeConfigured } from "@opengeni/artifact-tool/runtime/development";
-import { SESSION_WORKFLOW_WAKE_DISPATCHER_SCHEDULE_ID } from "@opengeni/core";
+import {
+  resolveCatalogSettings,
+  SESSION_WORKFLOW_WAKE_DISPATCHER_SCHEDULE_ID,
+} from "@opengeni/core";
 import {
   Connection,
   Client as TemporalClient,
@@ -357,6 +360,15 @@ export async function startApi(
       () => assertRuntimeDatabasePosture(dbClient.db, databasePosture),
       { ...retryOptions, onRetry },
     );
+    const resolvedCatalog = await retryStartupDependency(
+      "model catalog",
+      () => resolveCatalogSettings(dbClient.db, settings),
+      { ...retryOptions, onRetry },
+    );
+    observability.info("OpenGeni model catalog resolved", {
+      catalogSource: resolvedCatalog.source,
+      catalogVersion: resolvedCatalog.version,
+    });
     bus = await retryStartupDependency(
       "NATS",
       () =>

package/src/integrations/slack-interactions.ts

@@ -123,6 +123,7 @@ import {
   requireAccessContext,
   requireAccessGrant,
   requireSessionAuthorizationListScope,
+  resolveWorkspaceCatalogSettings,
   type ApiRouteDeps,
 } from "@opengeni/core";
 import { publishDurableSessionEvents } from "@opengeni/events";
@@ -1058,6 +1059,23 @@ export function registerSlackInteractionRoutes(app: Hono, deps: ApiRouteDeps): v
   });
 }
 
+async function withCatalogSettings(
+  deps: ApiRouteDeps,
+  grant: Pick<AccessGrant, "accountId" | "workspaceId">,
+): Promise<ApiRouteDeps> {
+  const catalogSourceSettings = deps.catalogSourceSettings ?? deps.settings;
+  return {
+    ...deps,
+    catalogSourceSettings,
+    settings: (
+      await resolveWorkspaceCatalogSettings(deps.db, catalogSourceSettings, {
+        accountId: grant.accountId,
+        workspaceId: grant.workspaceId,
+      })
+    ).settings,
+  };
+}
+
 async function publishSlackAppHome(
   deps: ApiRouteDeps,
   installation: SlackInstallationRoute,
@@ -2152,17 +2170,22 @@ async function processSlackInboxEntry(deps: ApiRouteDeps, entry: SlackInteractio
       preparedAttachments,
       preparedModelContext,
     );
-    session = await createSessionForRequest(deps, grant, interaction.workspaceId, {
-      requestedSessionId: interaction.sessionReservationId,
-      initialMessage: prepared.entry.text,
-      ...(prepared.modelContext ? { modelContext: prepared.modelContext } : {}),
-      instructions: SLACK_SESSION_INSTRUCTIONS,
-      firstPartyMcpTools: slackTaskFirstPartyMcpTools(deps.settings),
-      resources: preparedAttachments.resources,
-      ...(preferredModel ? { model: preferredModel } : {}),
-      idempotencyKey: `slack:${entry.connectionId}:${entry.providerEventId}`,
-      clientEventId: `slack:${entry.providerEventId}`,
-    });
+    session = await createSessionForRequest(
+      await withCatalogSettings(deps, grant),
+      grant,
+      interaction.workspaceId,
+      {
+        requestedSessionId: interaction.sessionReservationId,
+        initialMessage: prepared.entry.text,
+        ...(prepared.modelContext ? { modelContext: prepared.modelContext } : {}),
+        instructions: SLACK_SESSION_INSTRUCTIONS,
+        firstPartyMcpTools: slackTaskFirstPartyMcpTools(deps.settings),
+        resources: preparedAttachments.resources,
+        ...(preferredModel ? { model: preferredModel } : {}),
+        idempotencyKey: `slack:${entry.connectionId}:${entry.providerEventId}`,
+        clientEventId: `slack:${entry.providerEventId}`,
+      },
+    );
   } catch (error) {
     if (error instanceof HTTPException) {
       await client.postMessage({
@@ -2741,21 +2764,26 @@ async function processSlackReactionInboxEntry(
   const preparedEntry = slackReactionPreparedEntry(entry, context, preparedTask);
   let session: Awaited<ReturnType<typeof createSessionForRequest>>;
   try {
-    session = await createSessionForRequest(deps, grant, interaction.workspaceId, {
-      requestedSessionId: interaction.sessionReservationId,
-      initialMessage: preparedEntry.text,
-      instructions: SLACK_SESSION_INSTRUCTIONS,
-      // The exact reacted message and bounded containing thread are already in
-      // the prompt; do not expose general Slack history tools for this trigger.
-      firstPartyMcpTools: resolveFirstPartyMcpToolPolicy(deps.settings).default,
-      resources: preparedTask.resources,
-      ...(preferredModel ? { model: preferredModel } : {}),
-      // Every reaction entry converging on this route must use the same create
-      // key. This closes the same-owner multi-event race while the owner check
-      // above prevents a different subject from winning creation authority.
-      idempotencyKey: `slack-interaction:${interaction.id}`,
-      clientEventId: `slack:${entry.providerEventId}`,
-    });
+    session = await createSessionForRequest(
+      await withCatalogSettings(deps, grant),
+      grant,
+      interaction.workspaceId,
+      {
+        requestedSessionId: interaction.sessionReservationId,
+        initialMessage: preparedEntry.text,
+        instructions: SLACK_SESSION_INSTRUCTIONS,
+        // The exact reacted message and bounded containing thread are already in
+        // the prompt; do not expose general Slack history tools for this trigger.
+        firstPartyMcpTools: resolveFirstPartyMcpToolPolicy(deps.settings).default,
+        resources: preparedTask.resources,
+        ...(preferredModel ? { model: preferredModel } : {}),
+        // Every reaction entry converging on this route must use the same create
+        // key. This closes the same-owner multi-event race while the owner check
+        // above prevents a different subject from winning creation authority.
+        idempotencyKey: `slack-interaction:${interaction.id}`,
+        clientEventId: `slack:${entry.providerEventId}`,
+      },
+    );
     // The route-wide create key converges every replica on one reserved
     // session, but its first writer's initial message is the only event created
     // by that operation. Replay this exact Slack event through the normal
@@ -3143,11 +3171,17 @@ async function acceptSlackReactionTask(
     }
     return;
   }
-  await acceptSessionUserMessage(deps, grant, grant.workspaceId, sessionId, {
-    text: entry.text,
-    resources,
-    clientEventId,
-  });
+  await acceptSessionUserMessage(
+    await withCatalogSettings(deps, grant),
+    grant,
+    grant.workspaceId,
+    sessionId,
+    {
+      text: entry.text,
+      resources,
+      clientEventId,
+    },
+  );
 }
 
 async function continueSlackSession(
@@ -3230,12 +3264,18 @@ async function continueSlackSession(
   if (!hasPermission(grant.permissions, "sessions:control")) {
     throw new SlackInteractionPermanentError("sessions_control_denied");
   }
-  await acceptSessionUserMessage(deps, grant, interaction.workspaceId, interaction.sessionId, {
-    text: entry.text,
-    ...(options.modelContext ? { modelContext: options.modelContext } : {}),
-    resources,
-    clientEventId: `slack:${entry.providerEventId}`,
-  });
+  await acceptSessionUserMessage(
+    await withCatalogSettings(deps, grant),
+    grant,
+    interaction.workspaceId,
+    interaction.sessionId,
+    {
+      text: entry.text,
+      ...(options.modelContext ? { modelContext: options.modelContext } : {}),
+      resources,
+      clientEventId: `slack:${entry.providerEventId}`,
+    },
+  );
 }
 
 const SLACK_ACTION_ID_BY_KIND: Record<SlackInteractionActionKind, string> = {

package/src/mcp/server.ts

@@ -154,6 +154,7 @@ import {
   requireLiveAgentAttemptAuthorization,
   requireSessionAuthorization,
   requireSessionAuthorizationListScope,
+  resolveWorkspaceCatalogSettings,
   SessionAuthorizationDeniedError,
   SessionAuthorizationUnavailableError,
   saveWorkspaceMemoryWithSlackPublication,
@@ -1718,7 +1719,7 @@ export function buildOpenGeniMcpServer(
       async ({ id, triggerId }) => {
         const task = await requireScheduledTask(deps.db, grant.workspaceId, id);
         if (task.action.kind === "agent_turn") {
-          await validateScheduledTaskTarget({
+          const targetSession = await validateScheduledTaskTarget({
             db: deps.db,
             sessionAuthorization: deps.sessionAuthorization,
             authorizationSurface: "first_party_mcp",
@@ -1730,8 +1731,16 @@ export function buildOpenGeniMcpServer(
             agentConfig: task.agentConfig,
             missingTargetStatus: 404,
           });
+          const catalogSourceSettings = deps.catalogSourceSettings ?? deps.settings;
+          const catalogSettings = (
+            await resolveWorkspaceCatalogSettings(deps.db, catalogSourceSettings, {
+              accountId: grant.accountId,
+              workspaceId: grant.workspaceId,
+              ...(targetSession ? { retainedProductModelId: targetSession.model } : {}),
+            })
+          ).settings;
           await validateScheduledTaskMachineTarget({
-            settings: deps.settings,
+            settings: catalogSettings,
             db: deps.db,
             grant,
             runMode: task.runMode,