@opengeni/core 3.0.2-canary.38894290271001 → 3.1.2

package/dist/default-session-model.d.ts

@@ -155,6 +155,11 @@ export declare function loadWorkspaceModelSelectionInput(db: Database, settings:
 export declare function resolveCallerWorkspaceModelSelections(db: Database, settings: Settings, context: WorkspaceModelSelectionContext, options?: {
     observeAvailability?: boolean;
 }): Promise<WorkspaceModelSelection[]>;
+/**
+ * Catalog membership only: true while the workspace still lists the model,
+ * selectable or not. Retired and removed models are not listed.
+ */
+export declare function workspaceCatalogListsModel(selections: readonly WorkspaceModelSelection[], modelId: string): boolean;
 /** Transient selectability for existing consumers; not fresh-create admission. */
 export declare function selectableWorkspaceModel(selections: readonly WorkspaceModelSelection[], modelId: string): WorkspaceModelSelection | undefined;
 /** Same stable decision used by client config and direct fresh session creation. */

package/dist/domain/connector-tool-permissions.d.ts

@@ -21,6 +21,7 @@ type ListedTool = {
         destructiveHint?: boolean | undefined;
         title?: string | undefined;
     } | undefined;
+    _meta?: Record<string, unknown> | undefined;
 };
 export declare function connectorToolGroup(tool: ListedTool): "read" | "write" | "other";
 /** A selector can supply discovery credentials only when one visible account

package/dist/index.js

@@ -9881,6 +9881,9 @@ async function resolveCallerWorkspaceModelSelections(db, settings, context, opti
     })
   );
 }
+function workspaceCatalogListsModel(selections, modelId) {
+  return findSelection(selections, modelId) !== void 0;
+}
 function selectableWorkspaceModel(selections, modelId) {
   const selection = findSelection(selections, modelId);
   return selection?.availability.selectable ? selection : void 0;
@@ -26162,11 +26165,29 @@ async function actorDefaultModel(deps, grant, workspaceId) {
     subjectId: grant.subjectId
   });
 }
+async function workspaceCatalogMayHaveModel(deps, grant, workspaceId, modelId) {
+  try {
+    const selections = await resolveCallerWorkspaceModelSelections(deps.db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId,
+      subjectId: grant.subjectId
+    });
+    return workspaceCatalogListsModel(
+      selections,
+      canonicalizeConfiguredModelId6(deps.settings, modelId)
+    );
+  } catch {
+    return true;
+  }
+}
 async function hydrateNewSessionDraft(deps, grant, workspaceId, row, readOptions = {}) {
   if (!row) return null;
   const stored2 = mapNewSessionDraft(row);
   if (!stored2) return null;
-  const modelProvided = draftModelProvided(deps.settings, stored2);
+  let modelProvided = draftModelProvided(deps.settings, stored2);
+  if (modelProvided && readOptions.projectDefaultModel !== false && !await workspaceCatalogMayHaveModel(deps, grant, workspaceId, stored2.model)) {
+    modelProvided = false;
+  }
   let mapped = { ...stored2, modelProvided };
   if (!modelProvided && readOptions.projectDefaultModel !== false) {
     const resolved = await actorDefaultModel(deps, grant, workspaceId);
@@ -27836,6 +27857,7 @@ import {
   assertMcpToolListWithinBounds
 } from "@opengeni/runtime/mcp-network";
 import { createPinnedIntegrationTransport as createPinnedIntegrationTransport2 } from "@opengeni/capabilities";
+import { mcpToolRecommendsApproval } from "@opengeni/contracts";
 import {
   buildConnectionTokenResolver,
   getConnectionMetadata as getConnectionMetadata6,
@@ -28116,7 +28138,7 @@ async function getConnectorToolPermissions(input) {
           connectionId: target.connectionId,
           serverId: target.server.id,
           toolName: tool.name,
-          defaultDecision: target.server.requireApproval === true || Array.isArray(target.server.requireApproval) && target.server.requireApproval.includes(tool.name) ? "ask" : "allow"
+          defaultDecision: target.server.requireApproval === true || Array.isArray(target.server.requireApproval) && target.server.requireApproval.includes(tool.name) || mcpToolRecommendsApproval(tool) ? "ask" : "allow"
         })
       })
     ),
@@ -29040,6 +29062,7 @@ export {
   withWorkspaceDefaultMcpTools,
   withXaiSubscriptionProvider,
   workflowIdForSession,
+  workspaceCatalogListsModel,
   workspaceCreditsDisabled,
   workspaceCustomModelReference,
   workspaceInsightsPhaseMetricObserver,