@opengeni/core 1.0.1 → 2.1.0-canary.0

package/src/domain/session-tool-policy.ts

@@ -3,12 +3,13 @@ import {
   SESSION_EFFECTIVE_TOOL_POLICY_ID_LIMIT,
   SESSION_EFFECTIVE_TOOL_POLICY_ID_MAX_LENGTH,
   mergeToolRefs,
+  resolveWorkspaceSessionToolDefaults,
   type Session,
   type SessionEffectiveToolPolicy,
   type SessionToolPolicy,
   type ToolRef,
 } from "@opengeni/contracts";
-import type { Database } from "@opengeni/db";
+import { requireWorkspace, type Database } from "@opengeni/db";
 import { settingsWithEnabledCapabilityMcpServers } from "./capabilities";
 
 const MANDATORY_SESSION_MCP_SERVER_IDS = ["opengeni"] as const;
@@ -109,15 +110,12 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
   const configuredIds = effectiveIds.filter((id) => availableIds.has(id));
   const configuredIdSet = new Set(configuredIds);
   const droppedIds = effectiveIds.filter((id) => !configuredIdSet.has(id));
-  // Lazy discovery is scoped to the effective MCP allow-list, not only to
-  // workspace-default capability refs. An explicitly selected connector is
-  // directly callable from this same materialized list, so excluding it from
-  // the existing router creates a false "no connected sources" result. The
-  // mandatory first-party OpenGeni server stays eager; every other configured
-  // effective server is eligible for bounded schema disclosure.
+  // Lazy discovery is scoped to the effective MCP allow-list. Mandatory means
+  // selected/fail-loud, not eager: only an exact session ref with eager:true
+  // belongs on the first model request's critical path.
   const deferredIds = sortedIds(
     toolRefs
-      .filter((tool) => configuredIdSet.has(tool.id) && !mandatoryIdSet.has(tool.id))
+      .filter((tool) => configuredIdSet.has(tool.id) && tool.eager !== true)
       .map((tool) => tool.id),
   );
   const selectedIds = sortedIds(
@@ -187,7 +185,12 @@ export async function workspaceSessionToolPolicyDefaultServerIds(
   const runtimeSettings = await settingsWithEnabledCapabilityMcpServers(db, workspaceId, settings, {
     ...(subjectId ? { subjectId } : {}),
   });
-  return defaultSessionMcpServerIds(runtimeSettings.mcpServers);
+  const availableDefaults = defaultSessionMcpServerIds(runtimeSettings.mcpServers);
+  const workspace = await requireWorkspace(db, workspaceId);
+  const configured = resolveWorkspaceSessionToolDefaults(workspace.settings);
+  if (!configured) return availableDefaults;
+  const available = new Set(availableDefaults);
+  return sortedIds(configured.mcpServerIds.filter((id) => available.has(id)));
 }
 
 /** Add a bounded, secret-safe effective projection to a session response. */