@opengeni/core 3.0.2-canary.38894290271001 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/core",
-  "version": "3.0.2-canary.38894290271001",
+  "version": "3.1.2",
   "description": "Opengeni framework-agnostic core: the domain, access, and billing layers (neutral access, off-HTTP V2 surface). Behavior-preserving extraction from apps/api — keeps Hono's HTTPException for error throwing (typed-errors cleanup deferred).",
   "license": "Apache-2.0",
   "repository": {
@@ -50,18 +50,18 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@opengeni/capabilities": "3.0.2-canary.38894290271001",
-    "@opengeni/codex": "3.0.2-canary.38894290271001",
-    "@opengeni/config": "3.0.2-canary.38894290271001",
-    "@opengeni/contracts": "3.0.2-canary.38894290271001",
-    "@opengeni/db": "3.0.2-canary.38894290271001",
-    "@opengeni/documents": "3.0.2-canary.38894290271001",
-    "@opengeni/events": "3.0.2-canary.38894290271001",
-    "@opengeni/network": "3.0.2-canary.38894290271001",
-    "@opengeni/observability": "3.0.2-canary.38894290271001",
-    "@opengeni/runtime": "3.0.2-canary.38894290271001",
-    "@opengeni/storage": "3.0.2-canary.38894290271001",
-    "@opengeni/vaults": "3.0.2-canary.38894290271001",
+    "@opengeni/capabilities": "3.1.2",
+    "@opengeni/codex": "3.1.2",
+    "@opengeni/config": "3.1.2",
+    "@opengeni/contracts": "3.1.2",
+    "@opengeni/db": "3.1.2",
+    "@opengeni/documents": "3.1.2",
+    "@opengeni/events": "3.1.2",
+    "@opengeni/network": "3.1.2",
+    "@opengeni/observability": "3.1.2",
+    "@opengeni/runtime": "3.1.2",
+    "@opengeni/storage": "3.1.2",
+    "@opengeni/vaults": "3.1.2",
     "hono": "^4.12.18",
     "zod": "^4.2.1"
   },

package/src/application/new-session-drafts.ts

@@ -33,7 +33,11 @@ import {
 } from "../domain/resources";
 import { hasVerifiedOwningUserAuthorization, type AccessGrantAuthorization } from "../access";
 import { assertConfiguredModel, assertWorkspaceModelPolicyAllows } from "../domain/sessions";
-import { resolveDefaultSessionModel } from "../default-session-model";
+import {
+  resolveCallerWorkspaceModelSelections,
+  resolveDefaultSessionModel,
+  workspaceCatalogListsModel,
+} from "../default-session-model";
 import { canonicalizeConfiguredModelId, type Settings } from "@opengeni/config";
 
 type NewSessionDraftDependencies = Pick<AppDependencies, "settings" | "db" | "objectStorage">;
@@ -98,6 +102,32 @@ async function actorDefaultModel(
   });
 }
 
+/**
+ * False only when this workspace's catalog demonstrably no longer lists the
+ * model. A catalog read failure is not proof of removal, so it keeps the
+ * saved choice.
+ */
+async function workspaceCatalogMayHaveModel(
+  deps: Pick<NewSessionDraftDependencies, "db" | "settings">,
+  grant: AccessGrant,
+  workspaceId: string,
+  modelId: string,
+): Promise<boolean> {
+  try {
+    const selections = await resolveCallerWorkspaceModelSelections(deps.db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId,
+      subjectId: grant.subjectId,
+    });
+    return workspaceCatalogListsModel(
+      selections,
+      canonicalizeConfiguredModelId(deps.settings, modelId),
+    );
+  } catch {
+    return true;
+  }
+}
+
 type NewSessionDraftReadOptions = {
   /**
    * Project a draft that follows the default onto today's resolved default.
@@ -120,7 +150,18 @@ async function hydrateNewSessionDraft(
   // A draft that follows the default is projected onto today's default, so a
   // later subscription connect or credit purchase replaces an untouched free
   // model. The stored row is unchanged until the person saves again.
-  const modelProvided = draftModelProvided(deps.settings, stored);
+  let modelProvided = draftModelProvided(deps.settings, stored);
+  if (
+    modelProvided &&
+    readOptions.projectDefaultModel !== false &&
+    !(await workspaceCatalogMayHaveModel(deps, grant, workspaceId, stored.model))
+  ) {
+    // The saved choice left this workspace's catalog (a removed provider or a
+    // retired model). A new chat must not start on a model that cannot run, so
+    // the draft follows today's default until the person picks again. A model
+    // that is listed but temporarily unavailable keeps the person's choice.
+    modelProvided = false;
+  }
   let mapped: NewSessionDraftValue = { ...stored, modelProvided };
   if (!modelProvided && readOptions.projectDefaultModel !== false) {
     const resolved = await actorDefaultModel(deps, grant, workspaceId);

package/src/default-session-model.ts

@@ -575,6 +575,17 @@ export async function resolveCallerWorkspaceModelSelections(
   );
 }
 
+/**
+ * Catalog membership only: true while the workspace still lists the model,
+ * selectable or not. Retired and removed models are not listed.
+ */
+export function workspaceCatalogListsModel(
+  selections: readonly WorkspaceModelSelection[],
+  modelId: string,
+): boolean {
+  return findSelection(selections, modelId) !== undefined;
+}
+
 /** Transient selectability for existing consumers; not fresh-create admission. */
 export function selectableWorkspaceModel(
   selections: readonly WorkspaceModelSelection[],

package/src/domain/connector-tool-permissions.ts

@@ -22,6 +22,7 @@ import type {
   SessionMcpToolPermissionsResponse,
   UpdateSessionMcpToolPermissionsRequest,
 } from "@opengeni/contracts";
+import { mcpToolRecommendsApproval } from "@opengeni/contracts";
 import {
   buildConnectionTokenResolver,
   getConnectionMetadata,
@@ -76,6 +77,7 @@ type ListedTool = {
         title?: string | undefined;
       }
     | undefined;
+  _meta?: Record<string, unknown> | undefined;
 };
 
 export function connectorToolGroup(tool: ListedTool): "read" | "write" | "other" {
@@ -422,7 +424,8 @@ export async function getConnectorToolPermissions(
           defaultDecision:
             target.server.requireApproval === true ||
             (Array.isArray(target.server.requireApproval) &&
-              target.server.requireApproval.includes(tool.name))
+              target.server.requireApproval.includes(tool.name)) ||
+            mcpToolRecommendsApproval(tool)
               ? "ask"
               : "allow",
         }),