@opengeni/core 1.2.1-canary.37222965366001 → 1.3.0

package/dist/index.js

@@ -8,9 +8,11 @@ import {
   getManagedAuthRequestActorLeaseStamp,
   getManagedSession,
   markManagedAuthRequestActorTransitionApplied,
+  recordManagedAuthLoggedFailure,
   releaseManagedAuthRequestActorLease,
-  validateManagedAuthRequestActorLease
-} from "./chunk-MM6N7CTO.js";
+  validateManagedAuthRequestActorLease,
+  withManagedAuthSessionLookup
+} from "./chunk-672TAJCH.js";
 import "./chunk-QO5GVFFO.js";
 import {
   EDITABLE_ARTIFACT_HINT_MAX_BYTES,
@@ -835,7 +837,7 @@ function expandApiIntegrationAccountRoutes(input) {
 }
 
 // src/domain/session-connection-accounts.ts
-import { requireSession as requireSession3, requireWorkspace as requireWorkspace5 } from "@opengeni/db";
+import { requireSession as requireSession3, requireWorkspace as requireWorkspace6 } from "@opengeni/db";
 
 // src/domain/capabilities.ts
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -4886,7 +4888,7 @@ import {
   listDistinctRigVersionIdsInGroup,
   listInstalledPortableSkills,
   listEnabledMcpCapabilityServers as listEnabledMcpCapabilityServers2,
-  requireApprovalWithFloor,
+  resolveMcpApprovalRecommendation,
   getSandbox as getSandbox4,
   getSession as getSession3,
   getInitializedSessionCreateReplay,
@@ -4903,7 +4905,7 @@ import {
   getSessionTurnXaiProviderAccountAuthoritySnapshot,
   getSessionTurnClaudeProviderAccountAuthoritySnapshot,
   getWorkspaceModelPolicy as getWorkspaceModelPolicy2,
-  requireWorkspace as requireWorkspace4,
+  requireWorkspace as requireWorkspace5,
   initializeSessionStartAtomically,
   listSessionTurns,
   listSessionMcpServersForChildInheritance,
@@ -8444,7 +8446,9 @@ import {
   areOpenGeniSlackBotScopesAccepted
 } from "@opengeni/contracts";
 import {
-  getConnectionMetadata as getConnectionMetadata3
+  getConnectionMetadata as getConnectionMetadata3,
+  availableSlackBotConnectionMetadata,
+  requireWorkspace as requireWorkspace4
 } from "@opengeni/db";
 import { HTTPException as HTTPException16 } from "hono/http-exception";
 function openGeniSlackBotMetadata(metadata) {
@@ -8463,7 +8467,9 @@ function hasReservedOpenGeniSlackBotSessionMetadata(metadata) {
   );
 }
 async function requireOpenGeniSlackBotConnection(db, workspaceId, connectionId) {
-  const connection = await getConnectionMetadata3(db, workspaceId, connectionId, null);
+  const local = await getConnectionMetadata3(db, workspaceId, connectionId, null);
+  const workspace = await requireWorkspace4(db, workspaceId);
+  const connection = local ?? (await availableSlackBotConnectionMetadata(db, { accountId: workspace.accountId, workspaceId })).find((candidate) => candidate.id === connectionId) ?? null;
   if (!connection || !isOpenGeniSlackBotConnection(connection)) {
     throw new HTTPException16(422, {
       message: "slackBotConnectionId must reference an Opengeni Slack bot connection"
@@ -8536,9 +8542,10 @@ async function validateScheduledTaskSlackChannel(input) {
   });
 }
 function withScheduledSlackBotPostingTools(tools, agentConfig, allowedTools) {
-  if (!agentConfig.slackBotConnectionId || !agentConfig.slackBotChannelId) return [...tools];
+  const posting = new Set(SCHEDULED_SLACK_BOT_POSTING_TOOLS);
+  const next = tools.filter((tool) => !posting.has(tool));
+  if (!agentConfig.slackBotConnectionId || !agentConfig.slackBotChannelId) return next;
   const allowed = new Set(allowedTools);
-  const next = [...tools];
   for (const tool of SCHEDULED_SLACK_BOT_POSTING_TOOLS) {
     if (allowed.has(tool) && !next.includes(tool)) next.push(tool);
   }
@@ -10212,7 +10219,7 @@ async function createSessionForRequestInFileScope(unresolvedDeps, grant, workspa
   const workspace = await measureSessionStartPhase(
     unresolvedDeps.observability,
     "workspace_read",
-    () => requireWorkspace4(db, workspaceId)
+    () => requireWorkspace5(db, workspaceId)
   );
   const workspaceSessionToolDefaults = resolveWorkspaceSessionToolDefaults2(workspace.settings);
   const parentAuthority = parentSession ? await getSessionAuthorityProjection4(db, workspaceId, parentSession.id) : null;
@@ -10480,7 +10487,7 @@ async function createSessionForRequestInFileScope(unresolvedDeps, grant, workspa
           message: `MCP approval policy must name an enabled inherited capability: ${id}${/^api_(openapi|graphql)_/.test(id) ? "; API Integration tool approval is set at install with autoApprovedTools" : ""}`
         });
       }
-      mcpApprovalPolicies[id] = requireApprovalWithFloor(policy, inherited.approvalFloor, true) ?? false;
+      mcpApprovalPolicies[id] = resolveMcpApprovalRecommendation(policy, inherited.approvalFloor) ?? false;
     }
   }
   const resources = normalizeResources(
@@ -11454,7 +11461,7 @@ async function acceptSessionUserMessageInFileScope(deps, grant, workspaceId, ses
       runtimeMcpServers: runtimeSettings.mcpServers,
       defaultMcpServerIds: workspaceSessionToolPolicyDefaultServerIdsFor(
         capabilityRuntimeSettings.mcpServers,
-        (await requireWorkspace4(db, workspaceId)).settings
+        (await requireWorkspace5(db, workspaceId)).settings
       )
     });
     const { personalConnectionDelegations, mcpAccountBindings } = await freezeConnectionAccounts({
@@ -11765,7 +11772,7 @@ async function updateSessionToolPolicy(deps, grant, sessionId, request) {
   requirePermission(grant, "sessions:control");
   const agentAttemptCaller = grantHasAgentAttemptAuthority(grant);
   const existingSession = await requireSession2(deps.db, grant.workspaceId, sessionId);
-  const workspace = await requireWorkspace4(deps.db, grant.workspaceId);
+  const workspace = await requireWorkspace5(deps.db, grant.workspaceId);
   const workspaceSessionToolDefaults = resolveWorkspaceSessionToolDefaults2(workspace.settings);
   const capabilityRuntimeSettings = await settingsWithEnabledCapabilityMcpServers(
     deps.db,
@@ -12032,7 +12039,7 @@ async function updateSessionAgent(deps, grant, sessionId, request) {
   });
   requirePermission(grant, "sessions:control");
   const agentAttemptCaller = grantHasAgentAttemptAuthority(grant);
-  const workspace = await requireWorkspace4(deps.db, grant.workspaceId);
+  const workspace = await requireWorkspace5(deps.db, grant.workspaceId);
   const goal = await getSessionGoal(deps.db, grant.workspaceId, sessionId);
   const goalOpen = goal !== null && goal.status !== "completed";
   const deploymentPolicy = agentConfigDeploymentPolicy2(deps.settings);
@@ -12319,7 +12326,7 @@ async function freezeSessionRealtimeConnectionAccounts(input) {
     runtimeMcpServers: runtimeSettings.mcpServers,
     defaultMcpServerIds: workspaceSessionToolPolicyDefaultServerIdsFor(
       capabilitySettings.mcpServers,
-      (await requireWorkspace5(db, workspaceId)).settings
+      (await requireWorkspace6(db, workspaceId)).settings
     )
   });
   return await freezeConnectionAccounts({
@@ -13001,7 +13008,7 @@ import {
   grantWorkspaceAccess,
   listWorkspaceMembers,
   lockExternalWorkspaceMembershipLifecycle as lockExternalWorkspaceMembershipLifecycle3,
-  requireWorkspace as requireWorkspace6,
+  requireWorkspace as requireWorkspace7,
   setRlsContext,
   withWorkspaceSubjectRls as withWorkspaceSubjectRls3,
   addExternalWorkspaceMemberOperation,
@@ -13061,7 +13068,7 @@ async function addExternalWorkspaceMemberForRequest(c, deps, workspaceId, input)
     if (live.accountId !== grant.accountId || live.subjectId !== grant.subjectId || payload.permissions.some((permission) => !hasPermission(live.permissions, permission))) {
       throw new HTTPException18(403, { message: "membership authority changed" });
     }
-    const workspace = await requireWorkspace6(tx, workspaceId);
+    const workspace = await requireWorkspace7(tx, workspaceId);
     if (workspace.kind !== "shared" || workspace.accountId !== authority.accountId)
       throw new HTTPException18(403, {
         message: "external onboarding requires a shared organization workspace"
@@ -15617,7 +15624,7 @@ import {
   getWorkspaceDefaultRigId as getWorkspaceDefaultRigId2,
   withSessionRlsActorContext as withSessionRlsActorContext5,
   nestedPostgresSqlState as nestedPostgresSqlState6,
-  requireWorkspace as requireWorkspace7,
+  requireWorkspace as requireWorkspace8,
   scopedKnowledgeScopeKey,
   updateScheduledTask,
   ScheduledTaskHeadChangedError,
@@ -15793,7 +15800,7 @@ async function createValidatedScheduledTask(input) {
       message: "Personal source tasks create a private session for each run"
     });
   if (learning) {
-    const workspace = await requireWorkspace7(input.db, input.grant.workspaceId);
+    const workspace = await requireWorkspace8(input.db, input.grant.workspaceId);
     const destination = knowledgeAction?.destination.kind === "personal" || workspace.kind === "personal" || target?.tenancy?.visibility === "private" || target?.memoryScope === "user" ? "personal" : "workspace";
     if (learning.scope !== destination)
       throw new HTTPException26(422, {
@@ -17149,7 +17156,7 @@ async function validateScheduledTaskAgentConfig(input) {
   );
   const retainTools = unchangedCreationField("tools");
   const requestedTools = retainTools ? input.payload.agentConfig.tools : validateToolRefs(input.payload.agentConfig.tools ?? [], runtimeSettings);
-  const workspace = await requireWorkspace7(input.db, input.workspaceId);
+  const workspace = await requireWorkspace8(input.db, input.workspaceId);
   if (parent?.tenancy?.visibility === "private" && workspace.kind !== "personal" && input.payload.runMode !== "existing_session" && !input.payload.targetSessionId) {
     throw new HTTPException26(422, {
       message: "Schedule this private chat as the existing-session target, or create the task in your Personal workspace."
@@ -17330,7 +17337,7 @@ import {
   listScheduledTaskHumanWaitAttention,
   listScheduledTaskCreatorPolicies,
   listScheduledTaskRunAuthNeededEvents,
-  requireWorkspace as requireWorkspace8,
+  requireWorkspace as requireWorkspace9,
   ScheduledTaskHeadChangedError as ScheduledTaskHeadChangedError2
 } from "@opengeni/db";
 import { HTTPException as HTTPException27 } from "hono/http-exception";
@@ -17522,7 +17529,7 @@ async function computeScheduledTaskAccessPlan(input) {
   const [callerRegistry, ownerRegistry, workspaceSettings] = await Promise.all([
     runtimeRegistry(db, task.workspaceId, settings, input.grant.subjectId, cache),
     runtimeRegistry(db, task.workspaceId, settings, ownerSubjectId, cache),
-    input.workspaceSettings !== void 0 ? Promise.resolve(input.workspaceSettings) : requireWorkspace8(db, task.workspaceId).then((workspace) => workspace.settings)
+    input.workspaceSettings !== void 0 ? Promise.resolve(input.workspaceSettings) : requireWorkspace9(db, task.workspaceId).then((workspace) => workspace.settings)
   ]);
   const followsTask = scheduledTaskToolsFollowTask(task);
   const target = task.runMode === "existing_session" && task.targetSessionId ? await getSession6(db, task.workspaceId, task.targetSessionId) : null;
@@ -17628,7 +17635,7 @@ async function withScheduledTaskPolicyDrift(input) {
         workspaceId,
         actionable.map((task) => task.id)
       ),
-      requireWorkspace8(input.db, workspaceId).then((workspace) => workspace.settings)
+      requireWorkspace9(input.db, workspaceId).then((workspace) => workspace.settings)
     ]);
   } catch (error) {
     input.onError?.(error);
@@ -17790,7 +17797,7 @@ async function scheduledTasksWithUnavailableAccounts(input) {
   if (actionable.length === 0) return [];
   let workspaceSettings;
   try {
-    workspaceSettings = (await requireWorkspace8(input.db, input.grant.workspaceId)).settings;
+    workspaceSettings = (await requireWorkspace9(input.db, input.grant.workspaceId)).settings;
   } catch (error) {
     input.onError?.(error);
     return [];
@@ -17949,7 +17956,7 @@ import {
   listScheduledTasks,
   readWorkspaceInsightsModelBundle,
   readWorkspaceInsightsUsageBundle,
-  requireWorkspace as requireWorkspace9
+  requireWorkspace as requireWorkspace10
 } from "@opengeni/db";
 
 // src/domain/insights-timing.ts
@@ -18189,7 +18196,7 @@ async function getWorkspaceInsights(db, settings, input, observePhase) {
   await measureInsightsPhase(
     observePhase,
     "require_workspace",
-    () => requireWorkspace9(db, input.workspaceId)
+    () => requireWorkspace10(db, input.workspaceId)
   );
   const [visibleRootScope, visibleSessionScope] = await Promise.all([
     rootSessionId ? getSessionAccessProjection(db, input.workspaceId, rootSessionId) : null,
@@ -21755,6 +21762,7 @@ import {
   directIntegrationTransport,
   IntegrationInvocationError
 } from "@opengeni/capabilities";
+import { apiIntegrationToolEffect } from "@opengeni/db";
 function buildApiIntegrationMcpServers(input) {
   const transport = createPinnedIntegrationTransport({
     network: input.settings,
@@ -21784,6 +21792,14 @@ function buildApiIntegrationMcpServers(input) {
     return {
       id: integration.serverId,
       server,
+      effectAuthority: (toolName) => ({
+        kind: "api_integration",
+        instanceId: integration.instanceId,
+        baseUrl: integration.baseUrl,
+        connectionRef: integration.connectionRef,
+        connectionAuthorityGeneration: integration.connectionAuthorityGeneration,
+        effect: apiIntegrationToolEffect(integration.revision, toolName)
+      }),
       approvalAuthority: {
         kind: "api_integration",
         capabilityId: integration.capabilityId,
@@ -22113,6 +22129,7 @@ async function retainKnowledgeMessage(db, context, messageId) {
 
 // src/domain/connector-tool-permissions.ts
 import { slackRestMcpToolsForScopes } from "@opengeni/contracts/slack-rest-mcp";
+import { connectionAccountIdentityLabel as connectionAccountIdentityLabel2 } from "@opengeni/contracts/connection-account-label";
 import { createHash as createHash11 } from "crypto";
 import { Client as Client2 } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport as StreamableHTTPClientTransport2 } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
@@ -22128,8 +22145,12 @@ import {
   listConnectionsMetadata as listConnectionsMetadata4,
   listEnabledMcpCapabilityServers as listEnabledMcpCapabilityServers3,
   listConnectorToolPermissionPolicies,
+  listChangedConnectorToolPermissions,
   updateConnectorToolPermissionPolicies,
-  resolveConnectorActionPolicy as resolveConnectorActionPolicy2
+  projectConnectorToolPermission,
+  connectorToolPolicyRevision,
+  ConnectorToolPermissionConflictError,
+  listInstalledApiIntegrations as listInstalledApiIntegrations2
 } from "@opengeni/db";
 import { HTTPException as HTTPException32 } from "hono/http-exception";
 import {
@@ -22159,9 +22180,50 @@ function connectorToolPermissionReference(ref, connectionId) {
 }
 async function resolveTarget2(input) {
   if (input.capabilityId.startsWith("api:")) {
-    throw new HTTPException32(404, {
-      message: "Connected MCP connector not found; API Integration tool approval is set with installApiIntegration autoApprovedTools"
-    });
+    const integrations = (await listInstalledApiIntegrations2(
+      input.db,
+      input.workspaceId,
+      input.personalOwnerVerified ? input.grant.subjectId : void 0
+    )).filter((integration2) => integration2.capabilityId === input.capabilityId);
+    const accountId = (integration2) => integration2.connectionRef?.connectionId ?? `session-mcp:${integration2.serverId}:${createHash11("sha256").update(integration2.baseUrl, "utf8").digest("hex")}`;
+    const integration = integrations.find(
+      (candidate) => (!input.instanceKey || candidate.instanceKey === input.instanceKey) && (!input.connectionId || accountId(candidate) === input.connectionId)
+    );
+    if (!integration) throw new HTTPException32(404, { message: "Integration account unavailable" });
+    const server2 = settingsWithApiIntegrationServers({ ...input.settings, mcpServers: [] }, [
+      integration
+    ]).mcpServers[0];
+    const connection2 = integration.connectionRef?.connectionId ? await getConnectionMetadata5(
+      input.db,
+      input.workspaceId,
+      integration.connectionRef.connectionId,
+      input.grant.subjectId
+    ) : null;
+    const accounts = integrations.map((candidate) => ({
+      connectionId: accountId(candidate),
+      label: candidate.displayName,
+      scope: candidate.connectionRef?.subjectScope === "subject" ? "personal" : candidate.connectionRef ? "workspace" : "none",
+      instanceKey: candidate.instanceKey
+    }));
+    return {
+      server: server2,
+      connection: connection2,
+      connectionId: accountId(integration),
+      accountLabel: connection2 ? connectionAccountIdentityLabel2(connection2.metadata, integration.displayName) : integration.displayName,
+      accounts,
+      instanceKey: integration.instanceKey,
+      listedTools: integration.revision.tools.filter((tool) => integration.allowedTools.includes(tool.id)).map(
+        (tool) => ({
+          name: tool.id,
+          title: tool.name,
+          description: tool.description,
+          annotations: {
+            readOnlyHint: tool.safety === "read",
+            destructiveHint: tool.safety === "destructive"
+          }
+        })
+      )
+    };
   }
   const catalog = await buildCapabilityCatalog(input);
   const item = catalog.items.find((candidate) => candidate.id === input.capabilityId);
@@ -22174,25 +22236,31 @@ async function resolveTarget2(input) {
   if (!server || server.url !== item.endpointUrl)
     throw new HTTPException32(409, { message: "Connector configuration is unavailable" });
   const ref = server.connectionRef;
-  if (ref?.authoritySource === "host")
-    throw new HTTPException32(409, {
-      message: "Tool permissions for this connection are managed by its host"
+  if (ref?.subjectScope === "subject" && ref.accountSelection !== "all_eligible" && !input.personalOwnerVerified)
+    throw new HTTPException32(403, {
+      message: "Only the authenticated connection owner may manage personal tool permissions"
     });
-  let connection = ref?.connectionId ? await getConnectionMetadata5(
+  const visible = ref ? await listConnectionsMetadata4(
     input.db,
     input.workspaceId,
-    ref.connectionId,
-    input.grant.subjectId
-  ) : null;
-  if (ref && !ref.connectionId && (ref.subjectScope === "subject" || ref.accountSelection === "all_eligible")) {
-    const visible = await listConnectionsMetadata4(
-      input.db,
-      input.workspaceId,
-      input.grant.subjectId
-    );
-    connection = unpinnedConnectorToolPermissionAccount(ref, visible, input.grant.subjectId);
-  }
-  if (ref && (!connection || connection.providerDomain !== ref.providerDomain || ref.kind && connection.kind !== ref.kind || (ref.subjectScope === "subject" ? connection.subjectId !== input.grant.subjectId : connection.subjectId !== null))) {
+    input.personalOwnerVerified ? input.grant.subjectId : null
+  ) : [];
+  const bindings = mcpAccountBindingsFromVisibleConnections({
+    accountId: input.grant.accountId,
+    workspaceId: input.workspaceId,
+    subjectId: input.personalOwnerVerified ? input.grant.subjectId : null,
+    servers: [server],
+    // Runtime admission can enumerate every eligible account. A permission
+    // selector must also preserve the installation's explicit owner scope.
+    connections: ref?.accountSelection === "all_eligible" ? visible : visible.filter(
+      (candidate) => ref?.subjectScope === "subject" ? candidate.subjectId === input.grant.subjectId : candidate.subjectId === null
+    )
+  });
+  const binding = bindings.find(
+    (candidate) => !input.connectionId || candidate.connectionId === input.connectionId
+  );
+  const connection = visible.find((candidate) => candidate.id === binding?.connectionId) ?? null;
+  if (ref && !connection) {
     throw new HTTPException32(409, { message: "Reconnect this connector to manage its tools" });
   }
   if (connection?.subjectId && !input.personalOwnerVerified)
@@ -22200,13 +22268,30 @@ async function resolveTarget2(input) {
       message: "Only the authenticated connection owner may manage personal tool permissions"
     });
   const connectionId = connection?.id ?? `session-mcp:${server.id}:${createHash11("sha256").update(server.url, "utf8").digest("hex")}`;
-  return { server, connection, connectionId };
+  if (input.connectionId && input.connectionId !== connectionId)
+    throw new HTTPException32(409, {
+      message: "Connector account unavailable. Reload its permissions."
+    });
+  return {
+    server: binding ? { ...server, connectionRef: binding.connectionRef } : server,
+    connection,
+    connectionId,
+    accountLabel: binding?.accountLabel ?? server.name ?? server.id,
+    accounts: bindings.map((candidate) => ({
+      connectionId: candidate.connectionId,
+      label: candidate.accountLabel,
+      scope: candidate.subjectScope === "subject" ? "personal" : "workspace"
+    })),
+    instanceKey: void 0,
+    listedTools: null
+  };
 }
 function reviewedConnectorToolCatalog(server, grantedScopes) {
   const tools = isOfficialGmailMcpConfig(server.url, server.connectionRef) ? GMAIL_REST_MCP_TOOLS.filter((tool) => gmailToolSupportsScopes(tool.name, grantedScopes)) : isOfficialSlackMcpConfig(server.url, server.connectionRef) ? slackRestMcpToolsForScopes(grantedScopes) : null;
   return tools?.filter((tool) => !server.allowedTools || server.allowedTools.includes(tool.name)) ?? null;
 }
 async function listTools(input, target) {
+  if (target.listedTools !== null) return target.listedTools;
   const reviewed = reviewedConnectorToolCatalog(
     target.server,
     target.connection?.grantedScopes ?? []
@@ -22288,19 +22373,14 @@ async function getConnectorToolPermissions(input) {
     workspaceId: input.workspaceId,
     connectionId: target.connectionId
   });
-  const permission = (name) => {
-    const resolved = resolveConnectorActionPolicy2(policies, {
+  const changedTools = new Set(
+    await listChangedConnectorToolPermissions(input.db, {
+      accountId: input.grant.accountId,
+      workspaceId: input.workspaceId,
       connectionId: target.connectionId,
-      serverId: target.server.id,
-      toolName: name,
-      actionName: "*"
-    });
-    if (!resolved.managed) return { permission: "allow", inherited: true };
-    return {
-      permission: resolved.entry?.policy ?? "block",
-      inherited: resolved.entry?.toolName !== name
-    };
-  };
+      serverId: target.server.id
+    })
+  );
   const defaultPolicy = policies.find(
     (row) => row.serverId === target.server.id && row.toolName === "*" && row.actionName === "*"
   );
@@ -22322,15 +22402,25 @@ async function getConnectorToolPermissions(input) {
     tools: tools.map(
       (tool) => ({
         name: tool.name,
+        ...changedTools.has(tool.name) ? { resetReason: "operation_changed" } : {},
         ...tool.title ?? tool.annotations?.title ? { title: tool.title ?? tool.annotations?.title } : {},
         ...tool.description ? { description: tool.description } : {},
         group: connectorToolGroup(tool),
-        ...permission(tool.name),
-        approvalRequired: target.server.requireApproval === true || Array.isArray(target.server.requireApproval) && target.server.requireApproval.includes(tool.name)
+        ...projectConnectorToolPermission(policies, {
+          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"
+        })
       })
     ),
     discoveryError,
-    canManage: canManageConnectorPermissions(input.grant)
+    canManage: canManageConnectorPermissions(input.grant),
+    appliesTo: "next_attempt",
+    revision: connectorToolPolicyRevision(policies, target.connectionId, target.server.id),
+    accountLabel: target.accountLabel,
+    accounts: target.accounts,
+    ...target.instanceKey ? { instanceKey: target.instanceKey } : {}
   };
 }
 function canManageConnectorPermissions(grant) {
@@ -22343,20 +22433,32 @@ async function updateConnectorToolPermissions(input) {
     throw new HTTPException32(400, {
       message: "Tool names must be exact and cannot use the connector-default wildcard."
     });
-  const target = await resolveTarget2(input);
+  const target = await resolveTarget2({
+    ...input,
+    connectionId: input.payload.connectionId,
+    ...input.payload.instanceKey ? { instanceKey: input.payload.instanceKey } : {}
+  });
   if (target.connectionId !== input.payload.connectionId)
     throw new HTTPException32(409, {
       message: "The connector account changed. Reload its permissions."
     });
-  await updateConnectorToolPermissionPolicies(input.db, {
-    accountId: input.grant.accountId,
-    workspaceId: input.workspaceId,
-    subjectId: input.grant.subjectId,
-    connectionId: target.connectionId,
-    serverId: target.server.id,
-    toolNames: input.payload.target === "default" ? ["*"] : input.payload.toolNames,
-    policy: input.payload.permission
-  });
+  try {
+    await updateConnectorToolPermissionPolicies(input.db, {
+      accountId: input.grant.accountId,
+      workspaceId: input.workspaceId,
+      subjectId: input.grant.subjectId,
+      connectionId: target.connectionId,
+      serverId: target.server.id,
+      toolNames: input.payload.target === "default" ? ["*"] : input.payload.target === "action" ? [input.payload.toolName] : input.payload.toolNames,
+      ...input.payload.target === "action" ? { actionName: input.payload.actionName } : {},
+      ...input.payload.expectedRevision ? { expectedRevision: input.payload.expectedRevision } : {},
+      policy: input.payload.permission
+    });
+  } catch (error) {
+    if (error instanceof ConnectorToolPermissionConflictError)
+      throw new HTTPException32(409, { message: error.message });
+    throw error;
+  }
 }
 export {
   ArchivedSessionImportError2 as ArchivedSessionImportError,
@@ -22818,6 +22920,7 @@ export {
   readSessionAttachmentFiles,
   readSessionLineage,
   readSkill,
+  recordManagedAuthLoggedFailure,
   recordRigAuditEvent,
   recordSessionCreated,
   recordUserMessageAccepted,
@@ -23013,6 +23116,7 @@ export {
   withAgentConfigHttpErrors,
   withDefaultEnabledCapabilityMcpTools,
   withFrozenPersonalConnectionDelegations,
+  withManagedAuthSessionLookup,
   withResolvedSessionAuthorization,
   withSameRequestSessionMcpServerTools,
   withScheduledSlackBotPostingTools,