@opengeni/core 3.0.1 → 3.1.2

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

@@ -1,15 +1,46 @@
-import type { Settings } from "@opengeni/config";
 import {
+  resolveSessionFirstPartyMcpTools,
+  codeSearchDeploymentPolicy,
+  resolveModelProviderForTurn,
+  resolveFirstPartyDelegationSecret,
+  webSearchToolPlan,
+  type Settings,
+} from "@opengeni/config";
+import {
+  AGENT_SKILL_MANAGE_TOOL_NAMES,
+  AUTOMATIC_SESSION_TITLE_FALLBACK,
+  bundledSkillSelectionForAgentConfig,
+  CUA_DESKTOP_TOOLS,
+  DEFAULT_FIRST_PARTY_MCP_PERMISSIONS,
+  FIRST_PARTY_IN_PROCESS_TOOL_NAMES,
+  FirstPartyMcpToolName,
   SESSION_EFFECTIVE_TOOL_POLICY_ID_LIMIT,
   SESSION_EFFECTIVE_TOOL_POLICY_ID_MAX_LENGTH,
   mergeToolRefs,
+  projectAgentEffectiveTools,
+  resolveAgentToolFamilies,
+  resolveAgentMediaToolSurface,
+  resolveWorkspaceAgentHumanInputEnabled,
   resolveWorkspaceSessionToolDefaults,
+  workspaceSettingsAllowCreditModels,
+  type AgentFunctionToolName,
+  type AgentToolEnvironment,
+  type AgentMediaAttachment,
   type Session,
+  type SessionTurn,
   type SessionEffectiveToolPolicy,
   type SessionToolPolicy,
   type ToolRef,
 } from "@opengeni/contracts";
-import { requireWorkspace, type Database } from "@opengeni/db";
+import { codeSearchEnabledForTurn } from "@opengeni/contracts/code-search";
+import {
+  getSandbox,
+  listSkillDescriptors,
+  requireWorkspace,
+  sessionHasToolRouterHistory,
+  type Database,
+} from "@opengeni/db";
+import { resolveWorkspaceCatalogSettings } from "../model-catalog";
 import { settingsWithEnabledCapabilityMcpServers } from "./capabilities";
 
 const MANDATORY_SESSION_MCP_SERVER_IDS = ["opengeni"] as const;
@@ -65,8 +96,11 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     availableIds.has(id),
   );
   const mandatoryIdSet = new Set<string>(mandatoryIds);
-  const selectedRefs = mergeToolRefs([], input.sessionTools);
   const tracksWorkspaceDefaults = policy.mode === "workspace_default";
+  const excludedIds = new Set(tracksWorkspaceDefaults ? policy.excludedMcpServerIds : []);
+  const selectedRefs = mergeToolRefs([], input.sessionTools).filter(
+    (tool) => !excludedIds.has(tool.id) || mandatoryIdSet.has(tool.id),
+  );
 
   // Persisted refs may outlive a capability installation, deployment config,
   // or its credentials. Admission remains strict for newly requested refs, but
@@ -80,7 +114,7 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     toolRefs = mergeToolRefs(
       toolRefs,
       sortedIds(defaultIds)
-        .filter((id) => availableIds.has(id))
+        .filter((id) => availableIds.has(id) && !excludedIds.has(id))
         .map((id) => ({ kind: "mcp" as const, id, optional: true as const })),
     );
   }
@@ -97,7 +131,7 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
     selectedRefs,
     tracksWorkspaceDefaults
       ? sortedIds(defaultIds)
-          .filter((id) => availableIds.has(id))
+          .filter((id) => availableIds.has(id) && !excludedIds.has(id))
           .map((id) => ({ kind: "mcp" as const, id, optional: true as const }))
       : [],
   );
@@ -162,6 +196,74 @@ export function resolveSessionToolPolicy(input: SessionToolPolicyInput): Resolve
   };
 }
 
+/** Null is ordinary work; an empty list is a frozen scheduled selection. */
+export function scheduledTurnMcpServerIds(turn: Pick<SessionTurn, "metadata">): string[] | null {
+  const metadata = turn.metadata;
+  const value =
+    metadata && typeof metadata === "object" && !Array.isArray(metadata)
+      ? metadata.scheduledEffectiveMcpServerIds
+      : null;
+  return Array.isArray(value) && value.every((id) => typeof id === "string")
+    ? sortedIds(value)
+    : null;
+}
+
+/** The accepted scheduled built-in selection, including an explicit empty list. */
+export function scheduledTurnFirstPartyMcpTools(
+  turn: Pick<SessionTurn, "metadata">,
+): FirstPartyMcpToolName[] | null {
+  const value = turn.metadata?.scheduledFirstPartyMcpTools;
+  if (value === undefined) return null; // Older accepted snapshots use the stored list.
+  return FirstPartyMcpToolName.array().parse(value);
+}
+
+/**
+ * Execution's canonical turn selection. Ordinary turns use the durable session
+ * policy, not the queue's omitted-tools `[]`. Scheduled turns instead retain
+ * their frozen registry and refs, including an explicitly empty selection.
+ */
+export function resolveTurnToolPolicy(
+  input: Omit<SessionToolPolicyInput, "sessionTools"> & {
+    session: Pick<Session, "tools">;
+    turn: Pick<SessionTurn, "tools" | "metadata">;
+  },
+): ResolvedSessionToolPolicy {
+  const scheduledIds = scheduledTurnMcpServerIds(input.turn);
+  const availableIds = new Set(input.availableMcpServerIds);
+  return resolveSessionToolPolicy({
+    toolPolicy: input.toolPolicy,
+    sessionTools: scheduledIds ? input.turn.tools : input.session.tools,
+    availableMcpServerIds: scheduledIds
+      ? scheduledIds.filter((id) => availableIds.has(id))
+      : availableIds,
+    defaultMcpServerIds: scheduledIds ?? input.defaultMcpServerIds ?? [],
+  });
+}
+
+/** Resolve availability and defaults from the same subject-scoped registry read. */
+export async function workspaceSessionToolPolicyContext(
+  db: Database,
+  workspaceId: string,
+  settings: Settings,
+  subjectId?: string,
+  /** An in-flight read of this exact workspace a caller already started. */
+  workspaceRead?: ReturnType<typeof requireWorkspace>,
+): Promise<{ workspaceServerIds: string[]; workspaceDefaultServerIds: string[] }> {
+  const [runtimeSettings, workspace] = await Promise.all([
+    settingsWithEnabledCapabilityMcpServers(db, workspaceId, settings, {
+      ...(subjectId ? { subjectId } : {}),
+    }),
+    workspaceRead ?? requireWorkspace(db, workspaceId),
+  ]);
+  return {
+    workspaceServerIds: sortedIds(runtimeSettings.mcpServers.map((server) => server.id)),
+    workspaceDefaultServerIds: workspaceSessionToolPolicyDefaultServerIdsFor(
+      runtimeSettings.mcpServers,
+      workspace.settings,
+    ),
+  };
+}
+
 /** Current full runtime registry IDs, including configured static servers. */
 export async function workspaceSessionToolPolicyServerIds(
   db: Database,
@@ -185,12 +287,371 @@ export async function workspaceSessionToolPolicyDefaultServerIds(
   const runtimeSettings = await settingsWithEnabledCapabilityMcpServers(db, workspaceId, settings, {
     ...(subjectId ? { subjectId } : {}),
   });
-  const availableDefaults = defaultSessionMcpServerIds(runtimeSettings.mcpServers);
   const workspace = await requireWorkspace(db, workspaceId);
-  const configured = resolveWorkspaceSessionToolDefaults(workspace.settings);
+  return workspaceSessionToolPolicyDefaultServerIdsFor(
+    runtimeSettings.mcpServers,
+    workspace.settings,
+  );
+}
+
+/**
+ * The omitted-tools default for one resolved runtime registry and one
+ * workspace settings bag. Pure so a caller that already holds both never has
+ * to re-query the capability registry to agree with the worker and the
+ * composer on which connectors a `workspace_default` session executes with.
+ */
+export function workspaceSessionToolPolicyDefaultServerIdsFor(
+  runtimeMcpServers: Iterable<{ id: string }>,
+  workspaceSettings: unknown,
+): string[] {
+  const availableDefaults = defaultSessionMcpServerIds(runtimeMcpServers);
+  const configured = resolveWorkspaceSessionToolDefaults(workspaceSettings);
   if (!configured?.mcpServerIds) return availableDefaults;
   const available = new Set(availableDefaults);
-  return sortedIds(configured.mcpServerIds.filter((id) => available.has(id)));
+  return sortedIds([
+    ...configured.mcpServerIds.filter((id) => available.has(id)),
+    ...(configured.inheritConnectedMcpServers
+      ? availableDefaults.filter((id) => !["opengeni", "files", "docs"].includes(id))
+      : []),
+  ]);
+}
+
+/** Metadata only: no MCP listing, provider probes, account selection or credentials. */
+export type SessionEffectiveToolsContext = {
+  settings: Settings;
+  humanInputEnabled: boolean;
+  hasWorkspaceSkills: boolean;
+  workspaceSettings?: unknown;
+  objectStorageAvailable: boolean;
+  activeSandboxBackends?: ReadonlyMap<string, Settings["sandboxBackend"]>;
+  /** Exact build options after adapter/credential resolution, keyed by session. No pool-readiness inference. */
+  mediaAttachments?: ReadonlyMap<string, AgentMediaAttachment>;
+  routerInHistory?: boolean;
+  routerHistorySessionIds?: ReadonlySet<string>;
+};
+
+/**
+ * Resolve one context for a response page, not one catalog per session. Legacy
+ * rows require no additional reads and never acquire an effectiveTools field.
+ */
+export async function workspaceSessionEffectiveToolsContext(
+  deps: { db: Database; settings: Settings; objectStorage?: unknown },
+  workspaceId: string,
+  subjectId: string,
+  sessions: readonly Session[],
+  /** An in-flight read of this exact workspace a caller already started. */
+  workspaceRead?: ReturnType<typeof requireWorkspace>,
+): Promise<SessionEffectiveToolsContext> {
+  const configured = sessions.filter((session) => session.agent != null);
+  const baseline: SessionEffectiveToolsContext = {
+    settings: deps.settings,
+    humanInputEnabled: false,
+    hasWorkspaceSkills: false,
+    objectStorageAvailable: Boolean(deps.objectStorage),
+  };
+  if (configured.length === 0) return baseline;
+  const [workspace, catalog, descriptors, sandboxes, routerHistory] = await Promise.all([
+    workspaceRead ?? requireWorkspace(deps.db, workspaceId),
+    resolveWorkspaceCatalogSettings(deps.db, deps.settings, {
+      accountId: configured[0]!.accountId,
+      workspaceId,
+      retainedProductModelIds: configured.map((session) => session.model),
+    }),
+    configured.some((session) => session.agent?.capabilities.skills === "read")
+      ? listSkillDescriptors(deps.db, {
+          accountId: configured[0]!.accountId,
+          workspaceId,
+          subjectId,
+        })
+      : Promise.resolve([]),
+    deps.settings.sandboxSelfhostedEnabled
+      ? Promise.all(
+          sortedIds(configured.flatMap((session) => session.activeSandboxId ?? [])).map(
+            async (id) =>
+              [
+                id,
+                await getSandbox(
+                  deps.db,
+                  { accountId: configured[0]!.accountId, workspaceId, subjectId },
+                  id,
+                ),
+              ] as const,
+          ),
+        )
+      : Promise.resolve([]),
+    Promise.all(
+      [...new Map(configured.map((session) => [session.id, session])).values()].map(
+        async (session) =>
+          [
+            session.id,
+            await sessionHasToolRouterHistory(deps.db, {
+              accountId: session.accountId,
+              workspaceId,
+              sessionId: session.id,
+            }),
+          ] as const,
+      ),
+    ),
+  ]);
+  return {
+    ...baseline,
+    settings: catalog.settings,
+    workspaceSettings: workspace.settings,
+    humanInputEnabled: resolveWorkspaceAgentHumanInputEnabled(workspace.settings),
+    hasWorkspaceSkills: descriptors.some((entry) => entry.activationMode === "workspace_managed"),
+    activeSandboxBackends: new Map(
+      sandboxes.flatMap(([id, sandbox]) =>
+        sandbox?.kind === "selfhosted" ? [[id, "selfhosted" as const]] : [],
+      ),
+    ),
+    routerHistorySessionIds: new Set(
+      routerHistory.filter(([, present]) => present).map(([id]) => id),
+    ),
+  };
+}
+
+function sessionHasSkills(session: Session, context: SessionEffectiveToolsContext): boolean {
+  if (context.hasWorkspaceSkills || session.skills.length > 0) return true;
+  // Undefined is the worker's bundled default. Explicit [] means no bundles,
+  // and a "none" agent without an explicit list has none (as in the worker).
+  const bundledSkillIds = bundledSkillSelectionForAgentConfig(
+    session.bundledSkillIds,
+    session.agent,
+  );
+  if (bundledSkillIds === undefined) return true;
+  const tools = new Set(
+    resolveAgentToolFamilies(session.agent).firstPartyTools(
+      resolveSessionFirstPartyMcpTools(context.settings, session, context.workspaceSettings),
+    ),
+  );
+  return bundledSkillIds.some((id) => {
+    if (
+      [
+        "builtin:opengeni-documents",
+        "builtin:opengeni-spreadsheets",
+        "builtin:opengeni-presentations",
+      ].includes(id)
+    ) {
+      return tools.has("editable_artifact_list") && tools.has("editable_artifact_get");
+    }
+    if (id === "builtin:opengeni-sites") {
+      return tools.has("artifacts_create") && tools.has("artifacts_publish");
+    }
+    if (id === "builtin:opengeni-video-generation") {
+      return context.mediaAttachments?.get(session.id)?.video === true;
+    }
+    if (id === "builtin:opengeni-secrets") return tools.has("secret_search");
+    return true;
+  });
+}
+
+/** The server can prove attachment policy, not successful future provider calls. */
+export function sessionEffectiveToolProjectionInput(
+  session: Session & { agent: NonNullable<Session["agent"]> },
+  toolRefs: readonly ToolRef[],
+  context?: SessionEffectiveToolsContext,
+) {
+  const model = context ? resolveModelProviderForTurn(context.settings, session.model) : undefined;
+  const sandboxBackend =
+    (session.activeSandboxId
+      ? context?.activeSandboxBackends?.get(session.activeSandboxId)
+      : undefined) ?? session.sandboxBackend;
+  const sandboxAvailable = context !== undefined && sandboxBackend !== "none";
+  const supportsImages =
+    model?.model.api === "responses" && model.model.capabilities.inputModalities.includes("image");
+  const hostedToolNames: AgentFunctionToolName[] = [];
+  // Same plan the worker applies: provider web_search/web_fetch where the
+  // model has no hosted search (or the operator chose `replace`).
+  const webSearchPlan = context
+    ? webSearchToolPlan(context.settings, {
+        hostedWebSearch: model?.model.hostedWebSearch ?? context.settings.webSearchEnabled,
+        transportHostedSearch: model?.provider.kind === "xai-subscription",
+        creditsDisabled: !workspaceSettingsAllowCreditModels(context.workspaceSettings),
+      })
+    : { hostedWebSearch: false, providerTools: [] };
+  if (model?.provider.kind === "xai-subscription") {
+    if (context?.settings.webSearchEnabled) hostedToolNames.push("web_search", "x_search");
+  } else if (model?.model.hostedWebSearch && webSearchPlan.hostedWebSearch)
+    hostedToolNames.push("web_search");
+  const mediaAttachment =
+    context?.mediaAttachments?.get(session.id) ??
+    (context?.objectStorageAvailable === false
+      ? ({ image: null, video: false } as const)
+      : undefined);
+  const media = resolveAgentMediaToolSurface(session.agent, mediaAttachment);
+  hostedToolNames.push(...media.hosted);
+  const runtimeToolNames: AgentFunctionToolName[] = context
+    ? [
+        "request_human_input",
+        "list_models",
+        "skill_read",
+        ...AGENT_SKILL_MANAGE_TOOL_NAMES,
+        ...media.runtime,
+        ...webSearchPlan.providerTools,
+      ]
+    : [];
+  const sandboxToolNames: AgentFunctionToolName[] = sandboxAvailable
+    ? [
+        "exec_command",
+        "write_stdin",
+        "apply_patch",
+        ...(supportsImages ? ["view_image" as const] : []),
+        ...(session.resources.some((resource) => resource.kind === "repository")
+          ? ["repository_skill_read" as const]
+          : []),
+        ...(codeSearchEnabledForTurn(
+          session.codeSearchEnabled,
+          context?.workspaceSettings,
+          codeSearchDeploymentPolicy(context!.settings),
+        ) && session.sandboxOs !== "windows"
+          ? ["code_search" as const]
+          : []),
+      ]
+    : [];
+  const needsTitle =
+    session.titleSource !== "user" &&
+    (!session.title?.trim() || session.title.trim() === AUTOMATIC_SESSION_TITLE_FALLBACK);
+  const selectedFirstPartyMcpTools = context
+    ? resolveSessionFirstPartyMcpTools(context.settings, session, context.workspaceSettings)
+    : [];
+  const firstPartyMcpTools =
+    context && toolRefs.some((ref) => ref.id === "opengeni")
+      ? resolveAgentToolFamilies(session.agent, { sandboxAttached: sandboxAvailable })
+          .firstPartyTools(selectedFirstPartyMcpTools)
+          .filter((name) => name !== "set_session_title" || !needsTitle)
+      : [];
+  const interactionNames = new Set<string>(FIRST_PARTY_IN_PROCESS_TOOL_NAMES);
+  const firstPartyModelNames = new Map<FirstPartyMcpToolName, string>();
+  const permissions: readonly string[] =
+    session.firstPartyMcpPermissions ?? DEFAULT_FIRST_PARTY_MCP_PERMISSIONS;
+  const permissionAllowed = (permission: string) =>
+    permissions.includes(permission as never) || permissions.includes("workspace:admin");
+  if (context && resolveFirstPartyDelegationSecret(context.settings)) {
+    for (const name of FIRST_PARTY_IN_PROCESS_TOOL_NAMES) {
+      const readOnly = [
+        "interaction_discover",
+        "browser_observe",
+        "browser_read",
+        "browser_screenshot",
+        "browser_clipboard",
+        "browser_debug",
+        "browser_downloads",
+        "computer_targets",
+        "computer_observe",
+        "computer_clipboard",
+      ].includes(name);
+      if (
+        permissionAllowed(readOnly ? "sessions:read" : "sessions:control") &&
+        (name !== "browser_download_save" || permissionAllowed("files:upload"))
+      ) {
+        firstPartyModelNames.set(name, `interaction__${name}`);
+        if (
+          !firstPartyMcpTools.includes(name) &&
+          resolveAgentToolFamilies(session.agent, {
+            sandboxAttached: sandboxAvailable,
+          }).allowsFirstPartyTool(name) &&
+          selectedFirstPartyMcpTools.includes(name)
+        )
+          firstPartyMcpTools.push(name);
+      }
+    }
+  }
+  // Interaction names are never registered by the remote first-party server.
+  for (let index = firstPartyMcpTools.length - 1; index >= 0; index--) {
+    const name = firstPartyMcpTools[index]!;
+    if (interactionNames.has(name) && !firstPartyModelNames.has(name))
+      firstPartyMcpTools.splice(index, 1);
+  }
+  const codex = model?.provider.kind === "codex-subscription";
+  const nativeComputerTools = Boolean(
+    context &&
+    resolveFirstPartyDelegationSecret(context.settings) &&
+    permissionAllowed("sessions:control") &&
+    ["computer_open", "computer_act"].every((name) =>
+      resolveAgentToolFamilies(session.agent, { sandboxAttached: sandboxAvailable })
+        .firstPartyTools(selectedFirstPartyMcpTools)
+        .includes(name as FirstPartyMcpToolName),
+    ),
+  );
+  const retainedRouter =
+    context?.routerInHistory === true || context?.routerHistorySessionIds?.has(session.id) === true;
+  const progressiveDisclosure =
+    retainedRouter ||
+    (context
+      ? codex
+        ? context.settings.codexToolSearchEnabled
+        : context.settings.lazyToolSearchEnabled
+      : false);
+  const upfrontToolNames = new Set<string>([
+    ...hostedToolNames,
+    ...sandboxToolNames,
+    "skill_read",
+    "request_human_input",
+    "list_models",
+    ...webSearchPlan.providerTools,
+    ...(toolRefs.some((ref) => ref.id === "opengeni" && ref.eager === true) ||
+    !progressiveDisclosure
+      ? firstPartyMcpTools.filter((name) => !interactionNames.has(name) || !progressiveDisclosure)
+      : []),
+    ...(!progressiveDisclosure ? runtimeToolNames : []),
+    ...(nativeComputerTools && !progressiveDisclosure
+      ? CUA_DESKTOP_TOOLS.map((tool) => `interaction__cua_${tool.name}`)
+      : []),
+  ]);
+  const environment: AgentToolEnvironment = {
+    productServerIds: new Set([
+      ...session.mcpServers.map((server) => server.id),
+      ...(session.toolPolicy.mode !== "workspace_default"
+        ? session.tools.map((tool) => tool.id)
+        : []),
+    ]),
+    hasSkills: context ? sessionHasSkills(session, context) : false,
+    webSearch: hostedToolNames.includes("web_search") || webSearchPlan.providerTools.length > 0,
+    humanInput: context?.humanInputEnabled ?? false,
+    media: media.toolsKnown ? media.hosted.length + media.runtime.length > 0 : undefined,
+    routerInHistory:
+      context?.routerInHistory === true ||
+      context?.routerHistorySessionIds?.has(session.id) === true,
+    ...(context ? { sandboxAttached: sandboxAvailable } : {}),
+  };
+  const families = resolveAgentToolFamilies(session.agent, environment);
+  environment.hasDeferredTools =
+    (nativeComputerTools && progressiveDisclosure) ||
+    toolRefs.some(
+      (ref) => ref.id !== "opengeni" && ref.eager !== true && families.allowsMcpServer(ref.id),
+    ) ||
+    firstPartyMcpTools.some(
+      (name) => families.allowsFirstPartyTool(name) && !upfrontToolNames.has(name),
+    ) ||
+    runtimeToolNames.some(
+      (name) => families.allowsFunctionTool(name) && !upfrontToolNames.has(name),
+    );
+  const provider = model?.provider;
+  const native =
+    codex ||
+    (provider?.api === "responses" &&
+      (provider.wireProfile === "azure-openai" ||
+        (provider.builtin && provider.id === "openai" && provider.baseUrl === undefined)));
+  const routerToolNames: AgentFunctionToolName[] =
+    progressiveDisclosure && resolveAgentToolFamilies(session.agent, environment).router
+      ? ["tool_search", "tool_list", ...(native ? [] : ["tool_invoke" as const])]
+      : [];
+  for (const name of routerToolNames) upfrontToolNames.add(name);
+  return {
+    config: session.agent,
+    firstPartyMcpTools,
+    firstPartyModelNames,
+    nativeComputerTools,
+    mcpServerIds: toolRefs.map((ref) => ref.id),
+    productServerIds: environment.productServerIds ?? new Set<string>(),
+    environment,
+    runtimeToolNames,
+    hostedToolNames,
+    sandboxToolNames,
+    routerToolNames,
+    upfrontToolNames,
+    mediaAttachment,
+  };
 }
 
 /** Add a bounded, secret-safe effective projection to a session response. */
@@ -198,18 +659,32 @@ export function sessionWithEffectiveToolPolicy(
   session: Session,
   workspaceServerIds: Iterable<string>,
   workspaceDefaultServerIds: Iterable<string> = [],
+  effectiveToolsContext?: SessionEffectiveToolsContext,
 ): Session {
   const availableIds = new Set(workspaceServerIds);
   for (const server of session.mcpServers) {
     availableIds.add(server.id);
   }
+  const { effectivePolicy: effectiveToolPolicy, toolRefs } = resolveSessionToolPolicy({
+    toolPolicy: session.toolPolicy,
+    sessionTools: session.tools,
+    availableMcpServerIds: availableIds,
+    defaultMcpServerIds: workspaceDefaultServerIds,
+  });
   return {
     ...session,
-    effectiveToolPolicy: resolveSessionToolPolicy({
-      toolPolicy: session.toolPolicy,
-      sessionTools: session.tools,
-      availableMcpServerIds: availableIds,
-      defaultMcpServerIds: workspaceDefaultServerIds,
-    }).effectivePolicy,
+    effectiveToolPolicy,
+    // Configured sessions also report what they can use at capability level.
+    ...(session.agent
+      ? {
+          effectiveTools: projectAgentEffectiveTools(
+            sessionEffectiveToolProjectionInput(
+              { ...session, agent: session.agent },
+              toolRefs,
+              effectiveToolsContext,
+            ),
+          ),
+        }
+      : {}),
   };
 }