@opengeni/api-router 0.16.1 → 0.16.5

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createAppComposition,
   startSlackInteractionPump
-} from "./chunk-ZD5YBUNA.js";
+} from "./chunk-FGNCK7HE.js";
 
 // src/index.ts
 import {

package/dist/model-catalog.d.ts

@@ -32,6 +32,7 @@ export declare function buildWorkspaceModelCatalog(input: {
     settings: Settings;
     policy: WorkspaceModelPolicyContract | null;
     codexSubscriptionActive: boolean;
+    workspaceGatewayConnectionActive?: boolean;
     credentialReadinessObservations?: Readonly<Record<string, ModelCredentialReadinessObservation>> | undefined;
     observations?: Readonly<Record<string, ModelAvailabilityObservation>> | undefined;
     now?: Date | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "0.16.1",
+  "version": "0.16.5",
   "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": {
@@ -44,17 +44,17 @@
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@opengeni/agent-proto": "^0.3.0",
     "@opengeni/codex": "^0.2.9",
-    "@opengeni/config": "^0.9.3",
-    "@opengeni/contracts": "^0.30.0",
-    "@opengeni/core": "^0.17.1",
-    "@opengeni/db": "^0.21.0",
-    "@opengeni/documents": "^0.2.66",
-    "@opengeni/events": "^0.3.57",
-    "@opengeni/github": "^0.4.15",
+    "@opengeni/config": "^0.10.1",
+    "@opengeni/contracts": "^0.31.1",
+    "@opengeni/core": "^0.18.1",
+    "@opengeni/db": "^0.22.2",
+    "@opengeni/documents": "^0.2.70",
+    "@opengeni/events": "^0.3.60",
+    "@opengeni/github": "^0.4.17",
     "@opengeni/network": "^0.1.1",
-    "@opengeni/observability": "^0.4.2",
-    "@opengeni/runtime": "^0.16.2",
-    "@opengeni/storage": "^0.2.52",
+    "@opengeni/observability": "^0.4.4",
+    "@opengeni/runtime": "^0.17.1",
+    "@opengeni/storage": "^0.2.54",
     "@temporalio/client": "^1.17.0",
     "better-auth": "^1.6.14",
     "hono": "^4.12.18",

package/src/app.ts

@@ -387,7 +387,7 @@ export function createAppComposition(deps: AppDependencies): {
         // Provider-grouped model list for the picker. configuredModels() carries the
         // union of the built-in allow-list and every registry provider's models, in
         // selection order (default model first); project each to the client-safe
-        // ClientModel shape (ConfiguredModel.providerId → ClientModel.provider).
+        // provider-blind ClientModel shape (execution topology remains server-side).
         models: configuredModels(catalogSettings).map(projectClientModel),
         defaultReasoningEffort: deps.settings.openaiReasoningEffort,
         allowedReasoningEfforts: configuredAllowedReasoningEfforts(deps.settings),

package/src/model-catalog.ts

@@ -2,6 +2,7 @@ import {
   configuredModels,
   configuredProviders,
   withCodexCatalogProvider,
+  withWorkspaceGatewayCatalogProvider,
   type ConfiguredModel,
   type Settings,
 } from "@opengeni/config";
@@ -34,20 +35,30 @@ export const MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS = 5 * 60_000;
 
 /** Static, client-safe definition projection. No provider secret is reachable. */
 export function projectClientModel(model: ConfiguredModel): ClientModel {
+  const source =
+    model.credentialSource.kind === "connected_subscription"
+      ? "codex"
+      : model.credentialSource.kind === "workspace_connection"
+        ? "workspace_gateway"
+        : "opengeni";
+  const publicProvider =
+    source === "codex"
+      ? { provider: "codex", providerLabel: "Codex" }
+      : source === "workspace_gateway"
+        ? { provider: "workspace-gateway", providerLabel: "Your Gateway" }
+        : { provider: "opengeni", providerLabel: "OpenGeni" };
   return ClientModel.parse({
     id: model.id,
     label: model.label,
-    provider: model.providerId,
-    providerLabel: model.providerLabel,
+    ...publicProvider,
+    source,
     api: model.api,
     ...(model.contextWindowTokens === undefined
       ? {}
       : { contextWindowTokens: model.contextWindowTokens }),
     schemaVersion: model.schemaVersion,
     aliases: model.aliases,
-    deployment: model.deployment,
     executionLimits: model.executionLimits,
-    credentialSource: model.credentialSource,
     billing: model.billing,
     capabilities: model.capabilities,
     ...(model.pricing === undefined ? {} : { pricing: model.pricing }),
@@ -119,6 +130,7 @@ function credentialReadinessFor(input: {
   model: ConfiguredModel;
   provider: ReturnType<typeof configuredProviders>[number] | undefined;
   codexSubscriptionActive: boolean;
+  workspaceGatewayConnectionActive: boolean;
   observation: ModelCredentialReadinessObservation | undefined;
   nowMs: number;
   maxAgeMs: number;
@@ -134,6 +146,16 @@ function credentialReadinessFor(input: {
           checkedAt: null,
         };
   }
+  if (source.kind === "workspace_connection") {
+    return input.workspaceGatewayConnectionActive
+      ? { status: "ready", reason: null, basis: "connection", checkedAt: null }
+      : {
+          status: "not_ready",
+          reason: "needs_reauth",
+          basis: "connection",
+          checkedAt: null,
+        };
+  }
   if (source.kind === "deployment" && source.mechanism === "api_key") {
     return input.provider?.apiKey
       ? { status: "ready", reason: null, basis: "configuration", checkedAt: null }
@@ -146,7 +168,7 @@ function credentialReadinessFor(input: {
   }
   return observedCredentialReadiness({
     observation: input.observation,
-    basis: source.kind === "workspace_connection" ? "connection" : "resolver",
+    basis: "resolver",
     nowMs: input.nowMs,
     maxAgeMs: input.maxAgeMs,
   });
@@ -286,6 +308,7 @@ export function buildWorkspaceModelCatalog(input: {
   settings: Settings;
   policy: WorkspaceModelPolicyContract | null;
   codexSubscriptionActive: boolean;
+  workspaceGatewayConnectionActive?: boolean;
   credentialReadinessObservations?:
     | Readonly<Record<string, ModelCredentialReadinessObservation>>
     | undefined;
@@ -293,9 +316,10 @@ export function buildWorkspaceModelCatalog(input: {
   now?: Date | undefined;
   credentialReadinessMaxAgeMs?: number | undefined;
 }): WorkspaceModelCatalogResponseType {
-  const catalogSettings = input.settings.codexSubscriptionEnabled
+  const codexSettings = input.settings.codexSubscriptionEnabled
     ? withCodexCatalogProvider(input.settings)
     : input.settings;
+  const catalogSettings = withWorkspaceGatewayCatalogProvider(codexSettings);
   const providers = new Map(
     configuredProviders(catalogSettings).map((provider) => [provider.id, provider]),
   );
@@ -316,6 +340,7 @@ export function buildWorkspaceModelCatalog(input: {
       model,
       provider,
       codexSubscriptionActive: input.codexSubscriptionActive,
+      workspaceGatewayConnectionActive: input.workspaceGatewayConnectionActive === true,
       observation: input.credentialReadinessObservations?.[model.definitionVersion],
       nowMs,
       maxAgeMs,

package/src/routes/documents.ts

@@ -30,7 +30,7 @@ import {
   ensureDefaultBase,
   getDocument,
   getDocumentBase,
-  listDocumentBases,
+  listDocumentBasesEnsuringDefault,
   listDocuments,
   moveDocumentToBase,
   queueDocumentForReindex,
@@ -62,9 +62,14 @@ export function registerDocumentRoutes(app: Hono, deps: ApiRouteDeps): void {
 
   app.get("/v1/workspaces/:workspaceId/document-bases", async (c) => {
     const workspaceId = c.req.param("workspaceId");
-    await requireAccessGrant(c, deps, workspaceId, "documents:search");
+    const grant = await requireAccessGrant(c, deps, workspaceId, "documents:search");
     return c.json(
-      (await listDocumentBases(db, workspaceId)).map((base) => DocumentBase.parse(base)),
+      (
+        await listDocumentBasesEnsuringDefault(db, {
+          accountId: grant.accountId,
+          workspaceId,
+        })
+      ).map((base) => DocumentBase.parse(base)),
     );
   });
 

package/src/routes/sessions.ts

@@ -1367,6 +1367,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
         accountId: grant.accountId,
         workspaceId,
         sessionId,
+        subjectId: grant.subjectId,
         payload: event.payload,
         clientEventId: event.clientEventId ?? null,
       });

package/src/routes/workspaces.ts

@@ -37,6 +37,7 @@ import {
   updateWorkspaceSettings,
   upsertWorkspaceModelPolicy,
   workspaceCodexSubscriptionActive,
+  workspaceVercelAiGatewayConnectionActive,
 } from "@opengeni/db";
 import { boundWorkspaceControlHttpPage } from "@opengeni/events";
 import type { Hono } from "hono";
@@ -162,9 +163,10 @@ export function registerWorkspaceRoutes(app: Hono, deps: ApiRouteDeps): void {
   app.get("/v1/workspaces/:workspaceId/model-catalog", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     await requireAccessGrant(c, deps, workspaceId, "workspace:read");
-    const [policy, codexSubscriptionActive] = await Promise.all([
+    const [policy, codexSubscriptionActive, workspaceGatewayConnectionActive] = await Promise.all([
       getWorkspaceModelPolicy(deps.db, workspaceId),
       workspaceCodexSubscriptionActive(deps.db, deps.settings, workspaceId),
+      workspaceVercelAiGatewayConnectionActive(deps.db, workspaceId),
     ]);
     c.header("cache-control", "private, no-store");
     return c.json(
@@ -173,6 +175,7 @@ export function registerWorkspaceRoutes(app: Hono, deps: ApiRouteDeps): void {
           settings: deps.settings,
           policy,
           codexSubscriptionActive,
+          workspaceGatewayConnectionActive,
         }),
       ),
     );