@opengeni/api-router 0.26.1 → 0.30.1

package/src/model-catalog.ts

@@ -2,6 +2,7 @@ import {
   configuredModels,
   configuredProviders,
   withCodexCatalogProvider,
+  withXaiSubscriptionCatalogProvider,
   withWorkspaceGatewayCatalogProvider,
   type ConfiguredModel,
   type Settings,
@@ -37,16 +38,20 @@ export const MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS = 5 * 60_000;
 export function projectClientModel(model: ConfiguredModel): ClientModel {
   const source =
     model.credentialSource.kind === "connected_subscription"
-      ? "codex"
+      ? model.credentialSource.provider === "xai"
+        ? "supergrok"
+        : "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" };
+      : source === "supergrok"
+        ? { provider: "supergrok", providerLabel: "SuperGrok" }
+        : source === "workspace_gateway"
+          ? { provider: "workspace-gateway", providerLabel: "Your Gateway" }
+          : { provider: "opengeni", providerLabel: "OpenGeni" };
   return ClientModel.parse({
     id: model.id,
     label: model.label,
@@ -131,6 +136,7 @@ function credentialReadinessFor(input: {
   model: ConfiguredModel;
   provider: ReturnType<typeof configuredProviders>[number] | undefined;
   codexSubscriptionActive: boolean;
+  xaiSubscriptionActive: boolean;
   workspaceGatewayConnectionActive: boolean;
   observation: ModelCredentialReadinessObservation | undefined;
   nowMs: number;
@@ -138,7 +144,9 @@ function credentialReadinessFor(input: {
 }): ModelCredentialReadinessV1 {
   const source = input.model.credentialSource;
   if (source.kind === "connected_subscription") {
-    return input.codexSubscriptionActive
+    const active =
+      source.provider === "xai" ? input.xaiSubscriptionActive : input.codexSubscriptionActive;
+    return active
       ? { status: "ready", reason: null, basis: "connection", checkedAt: null }
       : {
           status: "not_ready",
@@ -309,6 +317,7 @@ export function buildWorkspaceModelCatalog(input: {
   settings: Settings;
   policy: WorkspaceModelPolicyContract | null;
   codexSubscriptionActive: boolean;
+  xaiSubscriptionActive?: boolean;
   workspaceGatewayConnectionActive?: boolean;
   credentialReadinessObservations?:
     | Readonly<Record<string, ModelCredentialReadinessObservation>>
@@ -320,7 +329,10 @@ export function buildWorkspaceModelCatalog(input: {
   const codexSettings = input.settings.codexSubscriptionEnabled
     ? withCodexCatalogProvider(input.settings)
     : input.settings;
-  const catalogSettings = withWorkspaceGatewayCatalogProvider(codexSettings);
+  const xaiSettings = input.settings.supergrokSubscriptionEnabled
+    ? withXaiSubscriptionCatalogProvider(codexSettings)
+    : codexSettings;
+  const catalogSettings = withWorkspaceGatewayCatalogProvider(xaiSettings);
   const providers = new Map(
     configuredProviders(catalogSettings).map((provider) => [provider.id, provider]),
   );
@@ -341,6 +353,7 @@ export function buildWorkspaceModelCatalog(input: {
       model,
       provider,
       codexSubscriptionActive: input.codexSubscriptionActive,
+      xaiSubscriptionActive: input.xaiSubscriptionActive === true,
       workspaceGatewayConnectionActive: input.workspaceGatewayConnectionActive === true,
       observation: input.credentialReadinessObservations?.[model.definitionVersion],
       nowMs,

package/src/routes/api-integrations.ts

@@ -1,13 +1,12 @@
 import {
-  CORE_PROVIDER_PRESETS,
+  CORE_INTEGRATION_DEFINITIONS,
   createPinnedIntegrationTransport,
-  integrationFeaturesForPreset,
-  providerDomainForPreset,
+  integrationFacetDefinitions,
   type IntegrationCredentialResolver,
 } from "@opengeni/capabilities";
 import {
   ApiIntegrationPreview,
-  ListApiIntegrationPresetsResponse,
+  ListIntegrationDefinitionsResponse,
   ApiIntegrationUninstallPreview,
   InstallApiIntegrationRequest,
   InstalledApiIntegration,
@@ -23,9 +22,9 @@ import {
   getApiIntegrationUninstallPreview,
   getConnectionMetadata,
   installApiIntegration,
-  IntegrationFeatureBindingOwnershipConflictError,
-  IntegrationFeatureBindingVersionConflictError,
-  IntegrationFeatureBindingVersionRequiredError,
+  IntegrationFacetBindingOwnershipConflictError,
+  IntegrationFacetBindingVersionConflictError,
+  IntegrationFacetBindingVersionRequiredError,
   listInstalledApiIntegrations,
   uninstallApiIntegration,
   type ConnectionMetadataWithVerification,
@@ -56,24 +55,26 @@ export function registerApiIntegrationRoutes(
     ...(overrides.fetchImpl ? { fetchImpl: overrides.fetchImpl } : {}),
   });
 
-  app.get("/v1/workspaces/:workspaceId/integrations/presets", async (c) => {
+  app.get("/v1/workspaces/:workspaceId/integrations/definitions", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     await requireAccessGrant(c, deps, workspaceId, "workspace:read");
     return c.json(
-      ListApiIntegrationPresetsResponse.parse({
-        presets: CORE_PROVIDER_PRESETS.map((preset) => ({
-          id: preset.id,
-          name: preset.name,
-          summary: preset.summary,
-          family: preset.family,
-          protocol: "openapi",
-          providerDomain: providerDomainForPreset(preset),
-          scopes: [...preset.oauth.scopes],
-          features: preset.features.map((feature) => ({
-            featureKey: feature.featureKey,
-            kind: feature.kind,
-            configSchema: { ...feature.configSchema },
-            capabilities: { ...feature.capabilities },
+      ListIntegrationDefinitionsResponse.parse({
+        definitions: CORE_INTEGRATION_DEFINITIONS.map((definition) => ({
+          id: definition.id,
+          name: definition.name,
+          summary: definition.summary,
+          protocol: definition.protocol,
+          provider: { ...definition.provider },
+          authentication: {
+            kind: definition.authentication.kind,
+            scopes: [...definition.authentication.scopes],
+          },
+          facets: definition.facets.map((facet) => ({
+            facetKey: facet.facetKey,
+            kind: facet.kind,
+            configSchema: { ...facet.configSchema },
+            capabilities: { ...facet.capabilities },
           })),
         })),
       }),
@@ -99,7 +100,8 @@ export function registerApiIntegrationRoutes(
             name: integration.name,
             description: integration.description,
             protocol: integration.protocol,
-            presetId: integration.presetId,
+            definitionId: integration.definitionId,
+            definitionProvenance: integration.definitionProvenance,
             providerDomain: integration.providerDomain,
             baseUrl: integration.baseUrl,
             sourceUrl: integration.sourceUrl,
@@ -193,7 +195,8 @@ export function registerApiIntegrationRoutes(
             description: resolved.preview.description,
             category: "integrations",
             tags: [resolved.preview.protocol, resolved.preview.provider ?? "custom"],
-            presetId: resolved.preview.presetId,
+            definitionId: resolved.preview.definitionId,
+            definitionProvenance: resolved.preview.definitionProvenance,
             ...(resolved.provider ? { provider: resolved.provider } : {}),
             providerDomain: resolved.preview.providerDomain,
             protocol: resolved.preview.protocol,
@@ -210,7 +213,7 @@ export function registerApiIntegrationRoutes(
             ownership:
               resolved.preview.connectionOwnership === "personal" ? "subject" : "workspace",
             ...(payload.allowedTools ? { allowedTools: payload.allowedTools } : {}),
-            featureDefinitions: integrationFeaturesForPreset(resolved.preview.presetId),
+            facetDefinitions: integrationFacetDefinitions(resolved.preview.definitionId),
             revision: resolved.revision,
           }),
         ),
@@ -218,9 +221,9 @@ export function registerApiIntegrationRoutes(
       );
     } catch (error) {
       if (
-        error instanceof IntegrationFeatureBindingVersionConflictError ||
-        error instanceof IntegrationFeatureBindingVersionRequiredError ||
-        error instanceof IntegrationFeatureBindingOwnershipConflictError
+        error instanceof IntegrationFacetBindingVersionConflictError ||
+        error instanceof IntegrationFacetBindingVersionRequiredError ||
+        error instanceof IntegrationFacetBindingOwnershipConflictError
       ) {
         throw new HTTPException(409, {
           message:
@@ -275,7 +278,7 @@ export function registerApiIntegrationRoutes(
       } catch (error) {
         if (
           error instanceof ApiIntegrationInstallationVersionConflictError ||
-          error instanceof IntegrationFeatureBindingVersionConflictError
+          error instanceof IntegrationFacetBindingVersionConflictError
         ) {
           throw new HTTPException(409, {
             message:

package/src/routes/browser-identities.ts

@@ -4,6 +4,7 @@ import {
   BrowserIdentityMutationResponse,
   BrowserRevisionListResponse,
   CreateBrowserIdentityRequest,
+  UpdateBrowserIdentityRequest,
 } from "@opengeni/contracts";
 import {
   BrowserIdentityConflictError,
@@ -13,6 +14,7 @@ import {
   getBrowserIdentity,
   listBrowserIdentities,
   listBrowserRevisions,
+  updateBrowserIdentity,
 } from "@opengeni/db";
 import { requireAccessGrant, type ApiRouteDeps } from "@opengeni/core";
 import type { Context, Hono } from "hono";
@@ -76,6 +78,28 @@ export function registerBrowserIdentityRoutes(app: Hono, deps: ApiRouteDeps): vo
     }
   });
 
+  app.patch("/v1/workspaces/:workspaceId/browser-identities/:identityId", async (context) => {
+    const workspaceId = context.req.param("workspaceId") ?? "";
+    const grant = await requireAccessGrant(context, deps, workspaceId, "sessions:control");
+    const identityId = uuidParam(context, "identityId");
+    const request = await parseJsonBody(context, UpdateBrowserIdentityRequest);
+    try {
+      return context.json(
+        BrowserIdentityMutationResponse.parse(
+          await updateBrowserIdentity(deps.db, {
+            accountId: grant.accountId,
+            workspaceId,
+            identityId,
+            actorSubjectId: grant.subjectId,
+            ...request,
+          }),
+        ),
+      );
+    } catch (error) {
+      throw browserIdentityRouteError(error);
+    }
+  });
+
   app.get(
     "/v1/workspaces/:workspaceId/browser-identities/:identityId/revisions",
     async (context) => {