@opengeni/core 1.0.1 → 2.1.0-canary.0

package/src/domain/personal-connection-delegations.ts

@@ -2,7 +2,9 @@ import type { McpServerConfig, Settings } from "@opengeni/config";
 import type {
   AccessGrant,
   ConnectionMetadata,
+  McpConnectionAuthoritySelection,
   McpPersonalConnectionDelegation,
+  ResourceRef,
   SessionTurn,
   SocialConnection,
   ToolRef,
@@ -14,21 +16,78 @@ import {
   googleDriveScopesAllowCapability,
 } from "@opengeni/contracts/google-drive";
 import {
+  isPersonalGitHubConnection,
+  PERSONAL_GITHUB_CONNECTION_SURFACE_ID,
+  PersonalGitHubConnectionMetadata,
+} from "@opengeni/contracts/personal-github";
+import {
+  getPersonalGitHubRepositorySelectionState,
   getSessionTurnPersonalConnectionDelegations,
   getConnectionMetadata,
   getSocialConnection,
-  getWorkspaceGrant,
   listConnectionsMetadata,
   listSocialConnections,
+  resolvePersonalConnectionAuthoritySelectionOrigin,
+  namedSubjectHasLiveWorkspaceAuthority,
   type Database,
   type ResolveConnectionCredentialInput,
   type ResolveConnectionCredentialResult,
 } from "@opengeni/db";
+import { personalGitHubRepositoryResources } from "./resources";
 
 export type PersonalConnectionDelegationSource =
-  | { kind: "subject"; subjectId: string }
+  | {
+      kind: "subject";
+      subjectId: string;
+      /**
+       * Organization of the authorizing grant. The owner-only
+       * personal-workspace pointer lives on an organization membership, so
+       * the account is part of the question, not an optimization.
+       */
+      accountId: string;
+    }
   | { kind: "turn"; sessionId: string; turnId: string }
   | { kind: "none" };
+
+/**
+ * Is `subjectId` still authorized in `workspaceId`?
+ *
+ * Personal-connection authority has always been "the owner must still belong
+ * to this workspace", but the old check was `getWorkspaceGrant` - a bare
+ * `workspace_memberships` join. A managed human's personal workspace
+ * deliberately has no row in that table (migration 0219 raises on one), so the
+ * join answered `false` for the one person who always belongs, and every
+ * personal connection silently disappeared inside the owner's own private
+ * workspace.
+ *
+ * `namedSubjectHasLiveWorkspaceAuthority` models both halves - the membership
+ * row and the organization membership's `personal_workspace_id` pointer - but
+ * it is an **oracle, not an authorization**: it answers for whatever subject it
+ * is handed and cannot establish who the caller is (see its doc comment in
+ * `@opengeni/db`). Every use is safe only because *this* module has already
+ * established entitlement to ask, locally:
+ *
+ * - at freeze time the subject is `source.subjectId`, and
+ *   `personalConnectionDelegationSourceForGrant` admits only a grant whose
+ *   `subjectId` came from a real authenticated principal. Agent-attempt,
+ *   service, service-initiated, and **delegated/bearer** grants never reach
+ *   this branch: they resolve to `{kind:"none"}`, or - for a worker-signed
+ *   agent attempt - to `{kind:"turn"}`, which probes only a frozen
+ *   `ownerSubjectId` already persisted for the grant's own workspace. Either
+ *   way an unvalidated signed-token subject is never the probed subject; and
+ * - on the `*ForGrant` paths the subject is the frozen `ownerSubjectId` of a
+ *   delegation already persisted for the workspace the caller is already
+ *   authorized in.
+ *
+ * Do not pass any other subject through this helper. A subject that was merely
+ * looked up, guessed, or supplied by a caller is not entitled.
+ */
+async function ownerStillBelongsToWorkspace(
+  db: Database,
+  input: { accountId: string; workspaceId: string; subjectId: string },
+): Promise<boolean> {
+  return await namedSubjectHasLiveWorkspaceAuthority(db, input);
+}
 export type AuthorizedSocialConnection = { connection: SocialConnection; subjectId: string | null };
 export type AuthorizedAtlassianConnection = {
   connection: ConnectionMetadata;
@@ -53,17 +112,48 @@ export function personalConnectionDelegationSourceForGrant(
 ): PersonalConnectionDelegationSource {
   const callerSessionId = grant.metadata?.["sessionId"];
   const callerTurnId = grant.metadata?.["turnId"];
+  // LOAD-BEARING ORDERING. This turn branch sits ABOVE the delegated filter
+  // below, so a grant carrying both `sessionId` and `turnId` never reaches that
+  // filter. That is safe only because `DelegatedAccessTokenPayload`'s
+  // `superRefine` forbids `principalKind: "human_session"` from carrying any
+  // attempt claim (`turnId`/`attemptId`/`executionGeneration`), so a delegated
+  // human-session bearer is structurally unable to take this branch. If that
+  // refinement is ever relaxed, a delegated bearer could route around the
+  // delegated filter by presenting a turn reference - move the filter above
+  // this branch at the same time. Pinned by
+  // `packages/contracts/test/delegated-access-token-attempt-claims.test.ts`.
   if (typeof callerSessionId === "string" && typeof callerTurnId === "string") {
     return { kind: "turn", sessionId: callerSessionId, turnId: callerTurnId };
   }
   if (
     grant.principalKind === "agent_attempt" ||
     grant.principalKind === "service" ||
-    grant.serviceInitiator
+    grant.serviceInitiator ||
+    // A delegated bearer's grant is built entirely from signed token payload
+    // (`delegatedAccessContext`); no database row binds its `subjectId` or
+    // `workspaceId` to anything. It is therefore never an entitled subject for
+    // the owner-only personal-workspace pointer, which CLAUDE.md reserves for
+    // the canonical managed-cookie session: "Bearer/delegated principals, API
+    // keys, and account or organization administrators receive no
+    // personal-workspace access through that exception." Before the pointer
+    // existed this was moot - `getWorkspaceGrant` returned null for a personal
+    // workspace regardless - so the filter belongs with the pointer.
+    //
+    // Why testing THIS field is sound while inspecting the others is not: a
+    // host signs `subjectId`, `principalKind`, and `serviceInitiator` into the
+    // token itself, so those are host-chosen and a hostile host picks whatever
+    // it likes. `metadata.delegated` is different - it is stamped by
+    // `delegatedAccessContext` in `@opengeni/core` AFTER the token signature is
+    // verified, and is not carried in the payload at all, so a host cannot
+    // clear it. Do not "harden" this by switching to `principalKind`. The
+    // strictly better shape is a positive assertion of how the request
+    // authenticated (a canonical managed-cookie stamp) rather than any
+    // inspection of the grant; that convergence is tracked separately.
+    grant.metadata?.delegated === true
   ) {
     return { kind: "none" };
   }
-  return { kind: "subject", subjectId: grant.subjectId };
+  return { kind: "subject", subjectId: grant.subjectId, accountId: grant.accountId };
 }
 
 export async function authorizedSocialConnectionsForGrant(input: {
@@ -102,7 +192,13 @@ export async function authorizedSocialConnectionsForGrant(input: {
   ).filter((item) => item.connectionType === "social");
   const personal: AuthorizedSocialConnection[] = [];
   for (const delegation of delegations) {
-    if (!(await getWorkspaceGrant(input.db, delegation.ownerSubjectId, input.grant.workspaceId)))
+    if (
+      !(await ownerStillBelongsToWorkspace(input.db, {
+        accountId: input.grant.accountId,
+        workspaceId: input.grant.workspaceId,
+        subjectId: delegation.ownerSubjectId,
+      }))
+    )
       continue;
     const connection = await getSocialConnection(
       input.db,
@@ -159,7 +255,13 @@ export async function authorizedAtlassianConnectionsForGrant(input: {
   ).filter((item) => item.connectionType === "atlassian");
   const personal: AuthorizedAtlassianConnection[] = [];
   for (const delegation of delegations) {
-    if (!(await getWorkspaceGrant(input.db, delegation.ownerSubjectId, input.grant.workspaceId))) {
+    if (
+      !(await ownerStillBelongsToWorkspace(input.db, {
+        accountId: input.grant.accountId,
+        workspaceId: input.grant.workspaceId,
+        subjectId: delegation.ownerSubjectId,
+      }))
+    ) {
       continue;
     }
     const connection = await getConnectionMetadata(
@@ -212,13 +314,19 @@ export function personalConnectionDelegationsFromVisibleConnections(input: {
   servers: McpServerConfig[];
   subjectId: string;
   connections: ConnectionMetadata[];
+  authoritySelections?: McpConnectionAuthoritySelection[];
+  rejectUnselectedActivatedConnections?: boolean;
 }): McpPersonalConnectionDelegation[] {
   const delegations: McpPersonalConnectionDelegation[] = [];
   const connections = canonicalPersonalConnections(input.connections);
+  const selections = new Map(
+    (input.authoritySelections ?? []).map((selection) => [selection.serverId, selection]),
+  );
   for (const server of input.servers) {
     const ref = server.connectionRef;
     if (!ref || ref.subjectScope !== "subject") continue;
-    const connection = connections.find(
+    const selection = selections.get(server.id);
+    const eligible = connections.filter(
       (candidate) =>
         candidate.subjectId === input.subjectId &&
         candidate.status === "active" &&
@@ -226,22 +334,69 @@ export function personalConnectionDelegationsFromVisibleConnections(input: {
         (!ref.kind || candidate.kind === ref.kind) &&
         (!ref.connectionId || candidate.id === ref.connectionId),
     );
+    // An explicit accepted-work selection is authoritative. Canonical newest
+    // ordering is only the bounded legacy/omission fallback; it must never
+    // replace a caller's exact opaque connection UUID when several accounts
+    // share one server/provider tuple.
+    const connection = selection
+      ? eligible.find((candidate) => candidate.id === selection.connectionId)
+      : eligible[0];
     if (!connection) continue;
+    if (connection.authorityId) {
+      if (
+        !selection ||
+        selection.connectionId !== connection.id ||
+        selection.userDelegation.authorityId !== connection.authorityId
+      ) {
+        if (input.rejectUnselectedActivatedConnections) {
+          throw new Error(
+            `scheduled connection authority selection is required for activated server ${server.id}`,
+          );
+        }
+        // Activated organization-user connections are never admitted through
+        // the legacy owner tuple. The caller must select one exact opaque grant.
+        continue;
+      }
+      selections.delete(server.id);
+    } else if (selection) {
+      throw new Error(`connection authority is not available for legacy server ${server.id}`);
+    }
     delegations.push({
       serverId: server.id,
       connectionId: connection.id,
+      ...(selection ? { originWorkspaceId: connection.workspaceId } : {}),
       ownerSubjectId: input.subjectId,
       providerDomain: connection.providerDomain,
       kind: connection.kind,
+      ...(selection ? { userDelegation: selection.userDelegation } : {}),
     });
   }
+  if (selections.size > 0) {
+    throw new Error(
+      `connection authority selection did not match an active selected server: ${[
+        ...selections.keys(),
+      ].join(", ")}`,
+    );
+  }
   return delegations;
 }
 
 export function personalConnectionDelegationsFromParent(input: {
   servers: McpServerConfig[];
   parentDelegations: McpPersonalConnectionDelegation[];
+  targetSessionId?: string;
+  rejectActivatedConnections?: boolean;
 }): McpPersonalConnectionDelegation[] {
+  // Every successor is new logical work. `once` remains bound to the original
+  // accepted turn, `session` may be re-admitted only into that exact session,
+  // and `always` may cross to another authorized session.
+  const childEligible = (delegation: McpPersonalConnectionDelegation) => {
+    const authority = delegation.userDelegation;
+    if (!authority) return true;
+    if (authority.mode === "once") return false;
+    if (authority.mode === "session") return authority.sessionId === input.targetSessionId;
+    return true;
+  };
   const mcp = input.servers.flatMap((server) => {
     const ref = server.connectionRef;
     if (!ref || ref.subjectScope !== "subject") return [];
@@ -251,19 +406,29 @@ export function personalConnectionDelegationsFromParent(input: {
         sameProviderDomain(candidate.providerDomain, ref.providerDomain) &&
         (!ref.kind || !candidate.kind || candidate.kind === ref.kind),
     );
-    return delegation ? [{ ...delegation }] : [];
+    return delegation && childEligible(delegation) ? [{ ...delegation }] : [];
   });
-  return [
+  const projected = [
     ...mcp,
     ...input.parentDelegations
       .filter(
         (item) =>
-          item.connectionType === "social" ||
-          item.connectionType === "atlassian" ||
-          item.serverId === GOOGLE_DRIVE_PUBLICATION_SERVER_ID,
+          childEligible(item) &&
+          (item.connectionType === "social" ||
+            item.connectionType === "atlassian" ||
+            item.serverId === GOOGLE_DRIVE_PUBLICATION_SERVER_ID),
       )
       .map((item) => ({ ...item })),
   ];
+  if (
+    input.rejectActivatedConnections &&
+    projected.some((delegation) => delegation.userDelegation)
+  ) {
+    throw new Error(
+      "scheduled connection authority is not available until task occurrence authority is activated",
+    );
+  }
+  return projected;
 }
 
 /**
@@ -275,7 +440,10 @@ export function personalConnectionDelegationsFromParent(input: {
 export function googleDrivePublicationDelegationFromVisibleConnections(input: {
   subjectId: string;
   connections: ConnectionMetadata[];
+  authoritySelection?: McpConnectionAuthoritySelection;
+  rejectUnselectedActivatedConnection?: boolean;
 }): McpPersonalConnectionDelegation | null {
+  const selection = input.authoritySelection;
   const eligible = input.connections.filter((connection) => {
     if (
       connection.subjectId !== input.subjectId ||
@@ -294,14 +462,176 @@ export function googleDrivePublicationDelegationFromVisibleConnections(input: {
       (!metadata.data.lifecycle || metadata.data.lifecycle.state === "active"),
     );
   });
-  if (eligible.length !== 1) return null;
-  const connection = eligible[0]!;
+  const selectedEligible = selection
+    ? eligible.filter((connection) => connection.id === selection.connectionId)
+    : eligible;
+  if (selection && selectedEligible.length !== 1) {
+    throw new Error("Google Drive publication authority selection is unavailable");
+  }
+  if (!selection && selectedEligible.length !== 1) return null;
+  const connection = selectedEligible[0]!;
+  if (connection.authorityId) {
+    if (
+      !selection ||
+      selection.serverId !== GOOGLE_DRIVE_PUBLICATION_SERVER_ID ||
+      selection.connectionId !== connection.id ||
+      selection.userDelegation.authorityId !== connection.authorityId
+    ) {
+      if (input.rejectUnselectedActivatedConnection) {
+        throw new Error(
+          "scheduled connection authority selection is required for activated Google Drive publication",
+        );
+      }
+      return null;
+    }
+  } else if (selection) {
+    throw new Error("connection authority is not available for legacy Google Drive publication");
+  }
+  // Freeze the exact output destination on the accepted delegation: a later
+  // connection-settings change must never redirect an already-accepted turn's
+  // publication. Eligibility above already proved the metadata parses and the
+  // destination exists.
+  const frozenMetadata = GoogleDriveConnectionMetadata.parse(connection.metadata);
+  if (!frozenMetadata.outputDestination) {
+    throw new Error("Google Drive publication destination disappeared during acceptance");
+  }
   return {
     serverId: GOOGLE_DRIVE_PUBLICATION_SERVER_ID,
     connectionId: connection.id,
+    ...(selection ? { originWorkspaceId: connection.workspaceId } : {}),
     ownerSubjectId: input.subjectId,
     providerDomain: connection.providerDomain,
     kind: connection.kind,
+    ...(selection ? { userDelegation: selection.userDelegation } : {}),
+    outputDestination: frozenMetadata.outputDestination,
+  };
+}
+
+export function personalAtlassianDelegationsFromVisibleConnections(input: {
+  subjectId: string;
+  connections: ConnectionMetadata[];
+  rejectActivatedConnections?: boolean;
+}): McpPersonalConnectionDelegation[] {
+  const eligible = input.connections.filter(
+    (connection) =>
+      connection.subjectId === input.subjectId &&
+      connection.status === "active" &&
+      sameProviderDomain(connection.providerDomain, "api.atlassian.com"),
+  );
+  if (input.rejectActivatedConnections && eligible.some((connection) => connection.authorityId)) {
+    throw new Error(
+      "scheduled connection authority selection is required for activated Atlassian access",
+    );
+  }
+  // Atlassian's first-party multi-call adapter is a named successor. Until it
+  // can consume an accepted snapshot, common-authority rows are omitted rather
+  // than falling through the legacy owner-tuple resolver.
+  return eligible
+    .filter((connection) => !connection.authorityId)
+    .map((connection) => ({
+      serverId: `atlassian:${connection.id}`,
+      connectionId: connection.id,
+      ownerSubjectId: input.subjectId,
+      providerDomain: connection.providerDomain,
+      kind: connection.kind,
+      connectionType: "atlassian" as const,
+    }));
+}
+
+async function personalGitHubDelegationFromVisibleConnections(input: {
+  db: Database;
+  accountId: string;
+  subjectId: string;
+  connections: ConnectionMetadata[];
+  resources: ResourceRef[];
+  authoritySelection?: McpConnectionAuthoritySelection;
+}): Promise<McpPersonalConnectionDelegation | null> {
+  const resources = personalGitHubRepositoryResources(input.resources);
+  if (resources.length === 0) {
+    if (input.authoritySelection) {
+      throw new Error("personal GitHub connection authority requires selected repositories");
+    }
+    return null;
+  }
+  const bindingIds = new Set(resources.map((resource) => resource.credentialBindingId));
+  if (bindingIds.size !== 1) {
+    throw new Error("accepted work may use only one personal GitHub account");
+  }
+  const authoritySelection = input.authoritySelection;
+  if (!authoritySelection) {
+    throw new Error("personal GitHub repository resources require explicit connection authority");
+  }
+  const connection = input.connections.find(
+    (candidate) =>
+      candidate.id === authoritySelection.connectionId &&
+      candidate.subjectId === input.subjectId &&
+      candidate.status === "active" &&
+      isPersonalGitHubConnection(candidate),
+  );
+  if (
+    !connection ||
+    !connection.authorityId ||
+    connection.authorityId !== authoritySelection.userDelegation.authorityId ||
+    connection.grantedScopes.length !== 1 ||
+    connection.grantedScopes[0] !== "repo"
+  ) {
+    throw new Error("personal GitHub connection authority selection is unavailable");
+  }
+  const metadata = PersonalGitHubConnectionMetadata.parse(connection.metadata);
+  const credentialBindingId = [...bindingIds][0]!;
+  if (metadata.credentialBindingId !== credentialBindingId) {
+    throw new Error("personal GitHub credential binding does not match the selected connection");
+  }
+  const selection = await getPersonalGitHubRepositorySelectionState(input.db, {
+    accountId: input.accountId,
+    originWorkspaceId: connection.workspaceId,
+    subjectId: input.subjectId,
+    connectionId: connection.id,
+  });
+  if (
+    !selection ||
+    selection.selectionGeneration <= 0 ||
+    selection.credentialBindingId !== credentialBindingId ||
+    selection.providerPrincipalId !== metadata.providerPrincipalId
+  ) {
+    throw new Error("personal GitHub repository selection changed or is unavailable");
+  }
+  const selectedById = new Map(
+    selection.repositories.map((repository) => [repository.repositoryId, repository]),
+  );
+  const repositories = resources.map((resource) => {
+    const selected = selectedById.get(resource.repositoryId);
+    if (
+      !selected ||
+      selected.canonicalUrl !== resource.uri ||
+      (resource.access === "write" && selected.selectedAccess !== "write")
+    ) {
+      throw new Error("personal GitHub repository resource is outside the selected authority");
+    }
+    return {
+      repositoryId: selected.repositoryId,
+      fullName: selected.fullName,
+      canonicalUrl: selected.canonicalUrl,
+      ref: resource.ref,
+      access: resource.access,
+      selectionGeneration: selected.selectionGeneration,
+    };
+  });
+  return {
+    serverId: PERSONAL_GITHUB_CONNECTION_SURFACE_ID,
+    connectionId: connection.id,
+    originWorkspaceId: connection.workspaceId,
+    ownerSubjectId: input.subjectId,
+    providerDomain: "github.com",
+    kind: "oauth2",
+    connectionType: "github_personal",
+    userDelegation: authoritySelection.userDelegation,
+    personalGitHubRepositorySelection: {
+      credentialBindingId,
+      connectionAuthorityGeneration: selection.connectionAuthorityGeneration,
+      selectionGeneration: selection.selectionGeneration,
+      repositories,
+    },
   };
 }
 
@@ -315,10 +645,15 @@ export function personalConnectionDelegationsEqual(
     const other = byServer.get(delegation.serverId);
     return (
       other?.connectionId === delegation.connectionId &&
+      other.originWorkspaceId === delegation.originWorkspaceId &&
       other.ownerSubjectId === delegation.ownerSubjectId &&
       sameProviderDomain(other.providerDomain, delegation.providerDomain) &&
       other.kind === delegation.kind &&
-      other.connectionType === delegation.connectionType
+      other.connectionType === delegation.connectionType &&
+      JSON.stringify(other.userDelegation ?? null) ===
+        JSON.stringify(delegation.userDelegation ?? null) &&
+      JSON.stringify(other.personalGitHubRepositorySelection ?? null) ===
+        JSON.stringify(delegation.personalGitHubRepositorySelection ?? null)
     );
   });
 }
@@ -368,6 +703,12 @@ export function withFrozenPersonalConnectionDelegations(input: {
   resolveCredential: ConnectionCredentialResolver;
   settings: Pick<Settings, "mcpServers">;
   personalConnectionDelegations: McpPersonalConnectionDelegation[];
+  /**
+   * Does the frozen delegation owner still hold workspace authority? Supply
+   * the canonical `namedSubjectHasLiveWorkspaceAuthority` resolver, never a bare
+   * `workspace_memberships` lookup: a managed human's personal workspace has
+   * no membership row, so a bare lookup revokes the owner's own connections.
+   */
   ownerHasWorkspaceMembership: (subjectId: string) => Promise<boolean>;
 }): ConnectionCredentialResolver {
   return async (request) => {
@@ -390,7 +731,11 @@ export function withFrozenPersonalConnectionDelegations(input: {
         : publicationDelegations.length === 1
           ? publicationDelegations[0]!
           : null;
-      if (!delegation || !(await input.ownerHasWorkspaceMembership(delegation.ownerSubjectId))) {
+      if (
+        !delegation ||
+        (!delegation.userDelegation &&
+          !(await input.ownerHasWorkspaceMembership(delegation.ownerSubjectId)))
+      ) {
         return personalAuthorityUnavailable(request);
       }
       effectiveRequest = {
@@ -415,16 +760,49 @@ export function withFrozenPersonalConnectionDelegations(input: {
 export async function freezePersonalConnectionDelegations(input: {
   db: Database;
   workspaceId: string;
-  settings: Pick<Settings, "mcpServers">;
+  settings: Pick<Settings, "mcpServers"> & Partial<Pick<Settings, "githubPersonalOauthEnabled">>;
   tools: ToolRef[];
+  resources?: ResourceRef[];
   source: PersonalConnectionDelegationSource;
+  authoritySelections?: McpConnectionAuthoritySelection[];
+  rejectUnselectedActivatedConnections?: boolean;
+  /** Exact first-party export tool + permission gate, not broad opengeni attachment. */
+  googleDrivePublicationEnabled?: boolean;
+  /** Exact first-party Atlassian tool + permission gate. */
+  atlassianEnabled?: boolean;
+  /** Exact target for successor-mode projection (`session` never crosses it). */
+  targetSessionId?: string;
 }): Promise<McpPersonalConnectionDelegation[]> {
   const servers = selectedPersonalConnectionServers(input.settings, input.tools);
   const includeFirstPartyConnections = input.tools.some((tool) => tool.id === "opengeni");
-  if ((servers.length === 0 && !includeFirstPartyConnections) || input.source.kind === "none") {
+  const personalGitHubResources = personalGitHubRepositoryResources(input.resources ?? []);
+  if (personalGitHubResources.length > 0 && input.settings.githubPersonalOauthEnabled !== true) {
+    throw new Error("personal GitHub repository authority is not enabled");
+  }
+  if (personalGitHubResources.length > 0 && input.source.kind === "none") {
+    throw new Error("personal GitHub repository authority requires an authenticated causal human");
+  }
+  if (
+    servers.length === 0 &&
+    !includeFirstPartyConnections &&
+    personalGitHubResources.length === 0
+  ) {
+    return [];
+  }
+  if (input.source.kind === "none") {
     return [];
   }
   if (input.source.kind === "turn") {
+    if ((input.authoritySelections?.length ?? 0) > 0) {
+      throw new Error(
+        "agent-created work inherits connection authority from its exact parent turn",
+      );
+    }
+    if (personalGitHubResources.length > 0) {
+      throw new Error(
+        "agent-created personal GitHub repository authority is not activated in this delivery phase",
+      );
+    }
     const inherited = personalConnectionDelegationsFromParent({
       servers,
       parentDelegations: await getSessionTurnPersonalConnectionDelegations(
@@ -433,30 +811,123 @@ export async function freezePersonalConnectionDelegations(input: {
         input.source.sessionId,
         input.source.turnId,
       ),
+      ...(input.targetSessionId ? { targetSessionId: input.targetSessionId } : {}),
+      ...(input.rejectUnselectedActivatedConnections !== undefined
+        ? { rejectActivatedConnections: input.rejectUnselectedActivatedConnections }
+        : {}),
+    });
+    return inherited.filter((item) => {
+      if (item.serverId === GOOGLE_DRIVE_PUBLICATION_SERVER_ID) {
+        return input.googleDrivePublicationEnabled === true;
+      }
+      if (item.connectionType === "atlassian") {
+        return includeFirstPartyConnections && input.atlassianEnabled === true;
+      }
+      if (item.connectionType === "social") {
+        return includeFirstPartyConnections;
+      }
+      return true;
     });
-    return includeFirstPartyConnections
-      ? inherited
-      : inherited.filter(
-          (item) =>
-            item.connectionType !== "social" &&
-            item.connectionType !== "atlassian" &&
-            item.serverId !== GOOGLE_DRIVE_PUBLICATION_SERVER_ID,
-        );
   }
-  const membership = await getWorkspaceGrant(input.db, input.source.subjectId, input.workspaceId);
-  if (!membership) return [];
-  const visibleConnections = await listConnectionsMetadata(
+  const ownerSubjectId = input.source.subjectId;
+  const membership = await ownerStillBelongsToWorkspace(input.db, {
+    accountId: input.source.accountId,
+    workspaceId: input.workspaceId,
+    subjectId: ownerSubjectId,
+  });
+  const targetLocalConnections = await listConnectionsMetadata(
     input.db,
     input.workspaceId,
-    input.source.subjectId,
+    ownerSubjectId,
+  );
+  const portableSelections = await Promise.all(
+    (input.authoritySelections ?? []).map(async (selection) => {
+      const originWorkspaceId = await resolvePersonalConnectionAuthoritySelectionOrigin(input.db, {
+        accountId: selection.userDelegation.organizationId,
+        targetWorkspaceId: input.workspaceId,
+        subjectId: ownerSubjectId,
+        connectionId: selection.connectionId,
+        delegation: selection.userDelegation,
+      });
+      if (!originWorkspaceId) {
+        throw new Error(`connection authority selection is unavailable: ${selection.serverId}`);
+      }
+      const connection = await getConnectionMetadata(
+        input.db,
+        originWorkspaceId,
+        selection.connectionId,
+        ownerSubjectId,
+      );
+      if (
+        !connection ||
+        connection.workspaceId !== originWorkspaceId ||
+        connection.subjectId !== ownerSubjectId ||
+        connection.authorityId !== selection.userDelegation.authorityId
+      ) {
+        throw new Error(`connection authority selection is unavailable: ${selection.serverId}`);
+      }
+      return connection;
+    }),
   );
+  if (!membership && portableSelections.length === 0) {
+    if (personalGitHubResources.length > 0) {
+      throw new Error("personal GitHub repository authority requires live causal user authority");
+    }
+    return [];
+  }
+  const visibleConnections = [
+    ...new Map(
+      [...targetLocalConnections, ...portableSelections].map((connection) => [
+        connection.id,
+        connection,
+      ]),
+    ).values(),
+  ];
+  const selectedMcpServerIds = new Set(servers.map((server) => server.id));
+  const supportedSelectionIds = new Set(selectedMcpServerIds);
+  if (input.googleDrivePublicationEnabled) {
+    supportedSelectionIds.add(GOOGLE_DRIVE_PUBLICATION_SERVER_ID);
+  }
+  if (personalGitHubResources.length > 0) {
+    supportedSelectionIds.add(PERSONAL_GITHUB_CONNECTION_SURFACE_ID);
+  }
+  const unsupportedSelections = (input.authoritySelections ?? []).filter(
+    (selection) => !supportedSelectionIds.has(selection.serverId),
+  );
+  if (unsupportedSelections.length > 0) {
+    throw new Error(
+      `connection authority selection did not match a selected MCP server: ${unsupportedSelections
+        .map((selection) => selection.serverId)
+        .join(", ")}`,
+    );
+  }
   const mcp = personalConnectionDelegationsFromVisibleConnections({
     servers,
-    subjectId: input.source.subjectId,
+    subjectId: ownerSubjectId,
     connections: visibleConnections,
+    authoritySelections: (input.authoritySelections ?? []).filter((selection) =>
+      selectedMcpServerIds.has(selection.serverId),
+    ),
+    ...(input.rejectUnselectedActivatedConnections !== undefined
+      ? { rejectUnselectedActivatedConnections: input.rejectUnselectedActivatedConnections }
+      : {}),
   });
-  if (!includeFirstPartyConnections) return mcp;
-  const ownerSubjectId = input.source.subjectId;
+  const personalGitHubAuthoritySelection = (input.authoritySelections ?? []).find(
+    (selection) => selection.serverId === PERSONAL_GITHUB_CONNECTION_SURFACE_ID,
+  );
+  const personalGitHub = await personalGitHubDelegationFromVisibleConnections({
+    db: input.db,
+    accountId: input.source.accountId,
+    subjectId: ownerSubjectId,
+    connections: visibleConnections,
+    resources: input.resources ?? [],
+    ...(personalGitHubAuthoritySelection
+      ? { authoritySelection: personalGitHubAuthoritySelection }
+      : {}),
+  });
+  if (!includeFirstPartyConnections) {
+    return [...mcp, ...(personalGitHub ? [personalGitHub] : [])];
+  }
   const visible = await listSocialConnections(input.db, input.workspaceId, 500, ownerSubjectId);
   const latest = new Map<"x" | "reddit", (typeof visible)[number]>();
   for (const connection of visible) {
@@ -470,18 +941,35 @@ export async function freezePersonalConnectionDelegations(input: {
     if (!prior || connection.updatedAt > prior.updatedAt)
       latest.set(connection.provider, connection);
   }
-  const personalAtlassian = visibleConnections.filter(
-    (connection) =>
-      connection.subjectId === ownerSubjectId &&
-      connection.status === "active" &&
-      sameProviderDomain(connection.providerDomain, "api.atlassian.com"),
-  );
-  const googleDrivePublication = googleDrivePublicationDelegationFromVisibleConnections({
-    subjectId: ownerSubjectId,
-    connections: visibleConnections,
-  });
+  const personalAtlassian = input.atlassianEnabled
+    ? personalAtlassianDelegationsFromVisibleConnections({
+        subjectId: ownerSubjectId,
+        connections: visibleConnections,
+        ...(input.rejectUnselectedActivatedConnections !== undefined
+          ? { rejectActivatedConnections: input.rejectUnselectedActivatedConnections }
+          : {}),
+      })
+    : [];
+  const googleDriveAuthoritySelection = input.googleDrivePublicationEnabled
+    ? (input.authoritySelections ?? []).find(
+        (selection) => selection.serverId === GOOGLE_DRIVE_PUBLICATION_SERVER_ID,
+      )
+    : undefined;
+  const googleDrivePublication = input.googleDrivePublicationEnabled
+    ? googleDrivePublicationDelegationFromVisibleConnections({
+        subjectId: ownerSubjectId,
+        connections: visibleConnections,
+        ...(googleDriveAuthoritySelection
+          ? { authoritySelection: googleDriveAuthoritySelection }
+          : {}),
+        ...(input.rejectUnselectedActivatedConnections !== undefined
+          ? { rejectUnselectedActivatedConnection: input.rejectUnselectedActivatedConnections }
+          : {}),
+      })
+    : null;
   return [
     ...mcp,
+    ...(personalGitHub ? [personalGitHub] : []),
     ...(googleDrivePublication ? [googleDrivePublication] : []),
     ...[...latest.values()].map((connection) => ({
       serverId: `social:${connection.provider}`,
@@ -491,13 +979,6 @@ export async function freezePersonalConnectionDelegations(input: {
       kind: "oauth2" as const,
       connectionType: "social" as const,
     })),
-    ...personalAtlassian.map((connection) => ({
-      serverId: `atlassian:${connection.id}`,
-      connectionId: connection.id,
-      ownerSubjectId,
-      providerDomain: connection.providerDomain,
-      kind: connection.kind,
-      connectionType: "atlassian" as const,
-    })),
+    ...personalAtlassian,
   ];
 }