@1mcp/agent 0.39.8 → 0.40.0-beta.1

package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js

@@ -10,12 +10,14 @@ import { projectResourceUri, resolveResourceRoute } from '../../shared/resourceT
 import { ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 import { withPrivateInteractionConnection } from './privateInteractionConnection.js';
+import { withInboundProjectAdmission } from './projectAdmission.js';
 import { withProviderRequestProgress } from './requestProviderProgress.js';
 import { bindOwnedCatalogConnections, bindOwnedNotificationAuthorization, subscribeOwnedResource, unsubscribeOwnedResource, } from './resourceSubscriptions.js';
 export function registerResourceHandlers(outboundConns, inboundConn) {
+    const handle = (work, message) => withErrorHandling(withInboundProjectAdmission(inboundConn, work), message);
     const acquire = (cursor, kind = 'resources') => acquireRuntimeCapabilityCatalog(outboundConns, resolveCapabilityVisibility(outboundConns, inboundConn, getRequestSession(inboundConn), 'resources'), { continuation: cursor ? { kind, cursor, enablePagination: inboundConn.enablePagination ?? false } : undefined });
     const server = getLegacyInboundServer(inboundConn);
-    server.setRequestHandler(ListResourcesRequestSchema, withErrorHandling(async (request, extra) => {
+    server.setRequestHandler(ListResourcesRequestSchema, handle(async (request, extra) => {
         bindOwnedCatalogConnections(outboundConns, inboundConn, 'resources');
         if (extra?.authInfo)
             bindOwnedNotificationAuthorization(outboundConns, inboundConn, () => revalidateLegacyRequestAuthInfo(extra.authInfo));
@@ -31,7 +33,7 @@ export function registerResourceHandlers(outboundConns, inboundConn) {
             ...(result._meta === undefined ? {} : { _meta: result._meta }),
         };
     }, 'Error listing resources'));
-    server.setRequestHandler(ListResourceTemplatesRequestSchema, withErrorHandling(async (request, extra) => {
+    server.setRequestHandler(ListResourceTemplatesRequestSchema, handle(async (request, extra) => {
         bindOwnedCatalogConnections(outboundConns, inboundConn, 'resources');
         if (extra?.authInfo)
             bindOwnedNotificationAuthorization(outboundConns, inboundConn, () => revalidateLegacyRequestAuthInfo(extra.authInfo));
@@ -47,7 +49,7 @@ export function registerResourceHandlers(outboundConns, inboundConn) {
             ...(result._meta === undefined ? {} : { _meta: result._meta }),
         };
     }, 'Error listing resource templates'));
-    server.setRequestHandler(SubscribeRequestSchema, withErrorHandling(async (request, extra) => {
+    server.setRequestHandler(SubscribeRequestSchema, handle(async (request, extra) => {
         await subscribeOwnedResource(outboundConns, inboundConn, request.params.uri, extra.signal, extra.authInfo ? () => revalidateLegacyRequestAuthInfo(extra.authInfo) : undefined);
         return {};
     }, 'Error subscribing to resource'));
@@ -55,7 +57,7 @@ export function registerResourceHandlers(outboundConns, inboundConn) {
         await unsubscribeOwnedResource(inboundConn, request.params.uri);
         return {};
     }, 'Error unsubscribing from resource'));
-    server.setRequestHandler(ReadResourceRequestSchema, withErrorHandling(async (request, extra) => {
+    server.setRequestHandler(ReadResourceRequestSchema, handle(async (request, extra) => {
         const snapshot = await acquire();
         const route = resolveResourceRoute(snapshot, request.params.uri);
         const assertResourceCurrent = () => {

package/build/sdk/legacy/server/protocol/resourceRequestHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"resourceRequestHandlers.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/server/protocol/resourceRequestHandlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resourceRequestHandlers.js","sourceRoot":"","sources":["../../../../../src/sdk/legacy/server/protocol/resourceRequestHandlers.ts"],"names":[],"mappings":"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"}

package/build/sdk/legacy/server/protocol/resourceSubscriptions.d.ts

@@ -16,7 +16,7 @@ export declare function requireOwnedNotificationAuthorization(connections: Legac
 /** Bind the admitted request grant before allowing unsolicited catalog delivery. */
 export declare function bindOwnedNotificationAuthorization(connections: LegacyOutboundConnections, inbound: InboundConnection, authorize: () => Promise<boolean>): void;
 /** Only the exact source/kind whose coverage belongs to this owner may enqueue a catalog event. */
-export declare function enqueueOwnedCatalogNotification(connections: LegacyOutboundConnections, inbound: InboundConnection, connection: LegacyOutboundConnection, notification: Update): void;
+export declare function enqueueOwnedCatalogNotification(connections: LegacyOutboundConnections, inbound: InboundConnection, connection: LegacyOutboundConnection, notification: Update, origin?: 'runtime-preparation'): void;
 /** Catalog invalidation remains synchronous upstream; recipient delivery never blocks its peers. */
 export declare function enqueueOwnedNotification(connections: LegacyOutboundConnections, inbound: InboundConnection, notification: Update, isCurrent?: () => boolean): void;
 export declare function subscribeOwnedResource(connections: LegacyOutboundConnections, inbound: InboundConnection, uri: string, signal?: AbortSignal, authorize?: () => Promise<boolean>): Promise<void>;

package/build/sdk/legacy/server/protocol/resourceSubscriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resourceSubscriptions.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/server/protocol/resourceSubscriptions.ts"],"names":[],"mappings":"AAMA,OAAO,EAAgB,KAAK,iBAAiB,EAAgB,MAAM,0BAA0B,CAAC;AAG9F,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAG/B,MAAM,4DAA4D,CAAC;AAsBpE,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AA6FD,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,wBAAwB,GAAG,IAAI,CAyB1F;AA+DD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAcrF;AAsHD,0FAA0F;AAC1F,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC3B,IAAI,CAMN;AAuFD,yHAAyH;AACzH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,IAAI,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GACtC,IAAI,CAmCN;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GACtC,IAAI,CAEN;AAED,oGAAoG;AACpG,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,GACzB,IAAI,CAEN;AAED,oFAAoF;AACpF,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAChC,IAAI,CAKN;AAED,mGAAmG;AACnG,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,YAAY,EAAE,MAAM,GACnB,IAAI,CAgBN;AAED,oGAAoG;AACpG,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,OAAO,GACxB,IAAI,CAiBN;AAED,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC,CAkIf;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrG;AAED,sFAAsF;AACtF,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAM3G;AAqCD,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,wBAAwB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAOlG"}
+{"version":3,"file":"resourceSubscriptions.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/server/protocol/resourceSubscriptions.ts"],"names":[],"mappings":"AAcA,OAAO,EAAgB,KAAK,iBAAiB,EAAgB,MAAM,0BAA0B,CAAC;AAQ9F,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAG/B,MAAM,4DAA4D,CAAC;AAuBpE,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAoGD,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,wBAAwB,GAAG,IAAI,CAyB1F;AAwED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrF;AAkMD,0FAA0F;AAC1F,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC3B,IAAI,CAMN;AA2GD,yHAAyH;AACzH,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,IAAI,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GACtC,IAAI,CAgEN;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,IAAI,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GACtC,IAAI,CAEN;AAED,oGAAoG;AACpG,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,GACzB,IAAI,CAEN;AAED,oFAAoF;AACpF,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAChC,IAAI,CAKN;AAED,mGAAmG;AACnG,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,wBAAwB,EACpC,YAAY,EAAE,MAAM,EACpB,MAAM,CAAC,EAAE,qBAAqB,GAC7B,IAAI,CAsBN;AAED,oGAAoG;AACpG,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,OAAO,GACxB,IAAI,CAIN;AAyBD,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,yBAAyB,EACtC,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC,CAuIf;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMrG;AAED,sFAAsF;AACtF,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAM3G;AAqCD,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,wBAAwB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAOlG"}

package/build/sdk/legacy/server/protocol/resourceSubscriptions.js

@@ -1,7 +1,14 @@
+import { getProjectLifecycle, projectPaths } from '../../../../application/projectLifecycle.js';
+import { getConfiguredServerTargets } from '../../../../config/configuredServerTargets.js';
+import { registerCapabilityPaginationNotifications } from '../../../../core/capabilities/capabilityPagination.js';
 import { acquireRuntimeCapabilityCatalog, } from '../../../../core/capabilities/runtimeCapabilityCatalog.js';
+import { getProjectPreparationAuthorityIdentity, validateProjectPreparationAuthority, } from '../../../../core/context/projectPreparationAuthority.js';
 import { getRequestSession, resolveCapabilityVisibility } from '../../../../core/protocol/requestHandlerUtils.js';
 import { AgentConfigManager } from '../../../../core/server/agentConfig.js';
+import { ServerManager } from '../../../../core/server/serverManager.js';
 import { ClientStatus, ServerStatus } from '../../../../core/types/index.js';
+import { PreparationConfigurationError, validatePreparationConfig, } from '../../../../domains/backend-preparation/integrationDefinitions.js';
+import { getProjectBinding, withProjectBinding } from '../../../../domains/project-selection/projectBindingScope.js';
 import logger from '../../../../logger/logger.js';
 import { toJsonValue } from '../../../contracts/index.js';
 import { requestLegacyOutbound, setOutboundNotificationHandler, } from '../../client/runtime/legacyOutboundConnection.js';
@@ -52,9 +59,13 @@ function countUnconfirmedUpstreamWatches() {
     return count;
 }
 async function acquireOwnerCatalog(owner) {
-    const visibility = resolveCapabilityVisibility(owner.connections, owner.inbound, getRequestSession(owner.inbound), 'resources');
+    const visibility = ownerVisibility(owner, 'resources');
     return acquireRuntimeCapabilityCatalog(owner.connections, visibility, { signal: owner.abort.signal });
 }
+function ownerVisibility(owner, kind) {
+    const resolve = () => resolveCapabilityVisibility(owner.connections, owner.inbound, owner.bindingId, kind);
+    return owner.binding ? withProjectBinding(owner.binding.bindingId, owner.binding.context, resolve) : resolve();
+}
 async function resolve(owner, uri, snapshot) {
     snapshot ??= await acquireOwnerCatalog(owner);
     return resolveResourceRoute(snapshot, uri);
@@ -98,15 +109,25 @@ function removeReservation(watch) {
     }
 }
 async function detach(watch) {
+    if (watch.teardown)
+        return watch.teardown;
+    watch.owner.teardowns.add(watch);
     removeReservation(watch);
     watch.abort.abort();
-    try {
-        await closeUpstreamWatch(watch);
-    }
-    catch (error) {
-        logger.warn('resourceSubscriptions.resource.subscription.cleanup.incomplete.0640deca', { error: error });
-        throw error;
-    }
+    watch.teardown = (async () => {
+        try {
+            await closeUpstreamWatch(watch);
+            watch.owner.teardowns.delete(watch);
+            releaseIdleProjectSubscription(watch.owner);
+        }
+        catch (error) {
+            watch.cleanupFailed = true;
+            monitorOwner(watch.owner);
+            logger.warn('resourceSubscriptions.resource.subscription.cleanup.incomplete.0640deca', { error: error });
+            throw error;
+        }
+    })();
+    return watch.teardown;
 }
 async function closeUpstreamWatch(watch) {
     if (watch.modern) {
@@ -155,21 +176,31 @@ function releaseUpstreamWatch(upstream, operation) {
     removeUpstreamRecord(upstream);
 }
 export async function cleanupOwnedResources(inbound) {
-    const owner = owners.get(inbound);
+    const all = owners.get(inbound);
+    owners.delete(inbound);
+    const results = await Promise.allSettled(Array.from(all?.values() ?? [], cleanupOwner));
+    if (results.some((result) => result.status === 'rejected'))
+        throw new Error('Resource subscription cleanup incomplete');
+}
+async function cleanupOwner(owner) {
     if (!owner || owner.closed)
         return;
     owner.closed = true;
     ownerCount--;
     owner.abort.abort();
     clearInterval(owner.monitor);
+    owner.monitor = undefined;
     for (const { connection } of owner.catalogs.values())
         catalogOwners.get(connection)?.delete(owner);
     owner.catalogs.clear();
     const results = await Promise.allSettled(Array.from(owner.watches.values(), detach));
     const failedWatches = results.filter((result) => result.status === 'rejected').length;
+    if (owner.teardowns.size)
+        monitorOwner(owner);
     if (failedWatches) {
         throw new Error('Resource subscription cleanup incomplete');
     }
+    releaseIdleProjectSubscription(owner);
 }
 function terminate(owner) {
     if (owner.closed)
@@ -189,15 +220,23 @@ function loseWatchCoverage(watch) {
     void detach(watch).catch(() => undefined);
 }
 function getOwner(connections, inbound) {
-    let owner = owners.get(inbound);
+    const bindingId = getRequestSession(inbound);
+    let byBinding = owners.get(inbound);
+    if (!byBinding)
+        owners.set(inbound, (byBinding = new Map()));
+    let owner = byBinding.get(bindingId ?? '');
     if (!owner) {
+        const existingOwner = byBinding.values().next().value;
         if (ownerCount >= MAX_PROCESS_WATCHES)
             throw new Error('Subscription owner admission limit exceeded');
         ownerCount++;
         owner = {
             inbound,
+            bindingId,
+            binding: getProjectBinding() ?? (bindingId ? { bindingId } : undefined),
             connections,
             watches: new Map(),
+            teardowns: new Set(),
             catalogs: new Map(),
             catalogKinds: new Set(),
             abort: new AbortController(),
@@ -207,11 +246,22 @@ function getOwner(connections, inbound) {
             bytes: 0,
             delivery: Promise.resolve(),
             checking: false,
+            requiresAuthorization: existingOwner?.requiresAuthorization,
+            authorize: existingOwner?.authorize,
         };
-        owners.set(inbound, owner);
+        byBinding.set(bindingId ?? '', owner);
     }
     return owner;
 }
+function retainProjectSubscription(owner) {
+    owner.releaseProjectSubscription ??= getProjectLifecycle()?.block(projectPaths(owner.binding?.context ?? owner.inbound.context), 'subscription', owner.bindingId ?? 'legacy');
+}
+function releaseIdleProjectSubscription(owner) {
+    if (owner.watches.size || owner.catalogs.size || owner.setups || owner.pending || owner.teardowns.size)
+        return;
+    owner.releaseProjectSubscription?.();
+    owner.releaseProjectSubscription = undefined;
+}
 async function assertWatchCurrent(watch, snapshot) {
     if (!watch.active || watch.owner.closed)
         return;
@@ -234,6 +284,38 @@ function supportsListChanged(connection, kind) {
         return false;
     return capability.listChanged === true;
 }
+/** Runtime-generated preparation changes require a current verified binding and configured adapter. */
+function preparationCatalogIdentity(connection, bindingId) {
+    if (!bindingId)
+        return undefined;
+    const definition = getConfiguredServerTargets()[connection.name];
+    let preparation;
+    try {
+        preparation = definition?.preparation ? validatePreparationConfig(definition.preparation) : undefined;
+    }
+    catch (error) {
+        if (error instanceof PreparationConfigurationError)
+            return undefined;
+        throw error;
+    }
+    if (definition?.disabled ||
+        preparation?.adapter !== 'configured-command' ||
+        !preparation.integration ||
+        !preparation.allowedActions.length)
+        return undefined;
+    const manager = ServerManager.current.getTemplateServerManager();
+    const context = manager.getBindingContext?.(bindingId);
+    const authority = manager.getBindingAuthority?.(bindingId);
+    if (!context?.sessionId ||
+        !authority ||
+        !validateProjectPreparationAuthority(authority, { bindingId, context, ownerSessionId: context.sessionId }))
+        return undefined;
+    return JSON.stringify({
+        definition,
+        effectiveRevision: preparation.effectiveRevision,
+        authority: getProjectPreparationAuthorityIdentity(authority, context),
+    });
+}
 async function assertCatalogCurrent(owner) {
     if (owner.inbound.subscriptionListKinds === undefined) {
         await refreshOrdinaryCatalog(owner);
@@ -252,9 +334,13 @@ function isCatalogSourceCurrent(owner, source) {
         return false;
     if (current.status !== ClientStatus.Connected)
         return false;
-    if (!supportsListChanged(current, source.kind))
+    if (source.preparationIdentity) {
+        if (preparationCatalogIdentity(current, owner.bindingId) !== source.preparationIdentity)
+            return false;
+    }
+    else if (!supportsListChanged(current, source.kind))
         return false;
-    const visibility = resolveCapabilityVisibility(owner.connections, owner.inbound, getRequestSession(owner.inbound), source.kind);
+    const visibility = ownerVisibility(owner, source.kind);
     return visibility.serverCandidates.has(source.connectionKey);
 }
 /** Ordinary clients follow the current catalog; an explicit modern filter pins its sources. */
@@ -272,9 +358,10 @@ async function refreshOrdinaryCatalog(owner) {
         if (connection.status !== ClientStatus.Connected)
             continue;
         for (const kind of owner.catalogKinds) {
-            if (!supportsListChanged(connection, kind))
+            if (!supportsListChanged(connection, kind) &&
+                !(kind === 'tools' && preparationCatalogIdentity(connection, owner.bindingId)))
                 continue;
-            const visibility = resolveCapabilityVisibility(owner.connections, owner.inbound, getRequestSession(owner.inbound), kind);
+            const visibility = ownerVisibility(owner, kind);
             if (!visibility.serverCandidates.has(key))
                 continue;
             if (!owner.catalogs.has(`${key}\0${kind}`))
@@ -283,10 +370,16 @@ async function refreshOrdinaryCatalog(owner) {
     }
     if (!changed)
         return;
-    if (owner.refreshCatalog)
-        await owner.refreshCatalog();
-    for (const kind of owner.catalogKinds)
-        bindOwnedCatalogConnections(owner.connections, owner.inbound, kind);
+    const bind = async () => {
+        if (owner.refreshCatalog)
+            await owner.refreshCatalog();
+        for (const kind of owner.catalogKinds)
+            bindOwnedCatalogConnections(owner.connections, owner.inbound, kind);
+    };
+    if (owner.binding)
+        await withProjectBinding(owner.binding.bindingId, owner.binding.context, bind);
+    else
+        await bind();
 }
 /** Install generation-aware forwarding again after ordinary catalog ownership changes. */
 export function bindOwnedCatalogRefresh(connections, inbound, refresh) {
@@ -302,6 +395,20 @@ function monitorOwner(owner) {
     if (owner.monitor)
         return;
     owner.monitor = setInterval(() => {
+        // Failed cleanup remains owned even after the inbound connection is gone.
+        for (const watch of owner.teardowns) {
+            if (!watch.cleanupFailed || watch.adapter?.state !== 'stopped')
+                continue;
+            owner.teardowns.delete(watch);
+        }
+        releaseClosedUpstreamReservations();
+        releaseIdleProjectSubscription(owner);
+        if (!owner.teardowns.size &&
+            (owner.closed || (!owner.watches.size && !owner.authorize && !owner.catalogKinds.size))) {
+            clearInterval(owner.monitor);
+            owner.monitor = undefined;
+            return;
+        }
         if (owner.closed || owner.checking)
             return;
         owner.checking = true;
@@ -368,6 +475,7 @@ function enqueue(owner, bytes, delivery) {
         terminate(owner);
         return;
     }
+    retainProjectSubscription(owner);
     owner.pending++;
     pendingUpdates++;
     pendingBytes += bytes;
@@ -384,6 +492,10 @@ function enqueue(owner, bytes, delivery) {
             await assertCatalogCurrent(owner);
             if (owner.closed)
                 return;
+            if (owner.inbound.status !== ServerStatus.Connected)
+                throw new Error('Subscription owner disconnected');
+            // Authorization may await a provider while this binding or preparation grant is revoked.
+            await assertCatalogCurrent(owner);
             await delivery();
         });
     })
@@ -393,6 +505,7 @@ function enqueue(owner, bytes, delivery) {
         pendingUpdates--;
         pendingBytes -= bytes;
         owner.bytes -= bytes;
+        releaseIdleProjectSubscription(owner);
     });
 }
 /** Legacy inbound connections implicitly receive supported catalog changes; private modern bridges pin their filters. */
@@ -404,7 +517,9 @@ export function registerOwnedCatalogConnection(connections, inbound, connection,
         return;
     if (selected && !selected.includes(kind))
         return;
-    if (!supportsListChanged(connection, kind))
+    const nativeChanges = supportsListChanged(connection, kind);
+    const preparationIdentity = kind === 'tools' && !nativeChanges ? preparationCatalogIdentity(connection, getRequestSession(inbound)) : undefined;
+    if (!nativeChanges && !preparationIdentity)
         return;
     const key = Array.from(connections).find(([, candidate]) => candidate === connection)?.[0];
     if (key === undefined)
@@ -432,11 +547,26 @@ export function registerOwnedCatalogConnection(connections, inbound, connection,
         terminate(owner);
         throw new Error('Catalog subscription source limit exceeded');
     }
-    owner.catalogs.set(coverageKey, { connection, adapter: connection.adapter, connectionKey: key, kind });
+    retainProjectSubscription(owner);
+    owner.catalogs.set(coverageKey, {
+        connection,
+        adapter: connection.adapter,
+        connectionKey: key,
+        kind,
+        ...(preparationIdentity ? { preparationIdentity } : {}),
+    });
     let listeners = catalogOwners.get(connection);
     if (!listeners)
         catalogOwners.set(connection, (listeners = new Set()));
     listeners.add(owner);
+    registerCapabilityPaginationNotifications(connections, connection, inbound, async (notification) => {
+        enqueueOwnedCatalogNotification(connections, inbound, connection, {
+            method: notification.method,
+            params: { ...notification.params, server: connection.name },
+        }, notification.origin);
+    }, 
+    // A native-only initial forwarder cannot tag synthetic changes for this source.
+    preparationIdentity ? undefined : { preserveExisting: true });
     setupOwnedResourceNotifications(connection);
     monitorOwner(owner);
 }
@@ -457,27 +587,39 @@ export function bindOwnedNotificationAuthorization(connections, inbound, authori
     monitorOwner(owner);
 }
 /** Only the exact source/kind whose coverage belongs to this owner may enqueue a catalog event. */
-export function enqueueOwnedCatalogNotification(connections, inbound, connection, notification) {
-    const owner = owners.get(inbound);
-    if (!owner || owner.closed)
-        return;
+export function enqueueOwnedCatalogNotification(connections, inbound, connection, notification, origin) {
     const kind = notification.method.split('/')[1];
-    const covered = Array.from(owner.catalogs.values()).some((source) => source.connection === connection && source.adapter === connection.adapter && source.kind === kind);
-    if (!covered)
-        return;
-    const adapter = connection.adapter;
-    enqueueOwnedNotification(connections, inbound, notification, () => {
-        if (connection.adapter !== adapter)
-            return false;
-        if (connection.status !== ClientStatus.Connected)
-            return false;
-        return Array.from(owner.catalogs.values()).some((source) => source.connection === connection && source.adapter === adapter && source.kind === kind);
-    });
+    for (const owner of owners.get(inbound)?.values() ?? []) {
+        if (owner.closed)
+            continue;
+        if (!allowsOwnedNotification(owner.inbound, notification))
+            continue;
+        const covered = Array.from(owner.catalogs.values()).some((source) => source.connection === connection &&
+            source.adapter === connection.adapter &&
+            source.kind === kind &&
+            (!source.preparationIdentity || origin === 'runtime-preparation'));
+        if (!covered)
+            continue;
+        const adapter = connection.adapter;
+        enqueueOwnerNotification(owner, notification, () => {
+            if (connection.adapter !== adapter)
+                return false;
+            if (connection.status !== ClientStatus.Connected)
+                return false;
+            return Array.from(owner.catalogs.values()).some((source) => source.connection === connection && source.adapter === adapter && source.kind === kind);
+        });
+    }
 }
 /** Catalog invalidation remains synchronous upstream; recipient delivery never blocks its peers. */
 export function enqueueOwnedNotification(connections, inbound, notification, isCurrent) {
-    if (inbound.requestOnly)
+    if (!allowsOwnedNotification(inbound, notification))
         return;
+    const owner = getOwner(connections, inbound);
+    enqueueOwnerNotification(owner, notification, isCurrent);
+}
+function allowsOwnedNotification(inbound, notification) {
+    if (inbound.requestOnly)
+        return false;
     const kinds = {
         'notifications/tools/list_changed': 'tools',
         'notifications/resources/list_changed': 'resources',
@@ -485,16 +627,20 @@ export function enqueueOwnedNotification(connections, inbound, notification, isC
     };
     const kind = kinds[notification.method];
     if (kind && !AgentConfigManager.getInstance().get('features').clientNotifications)
-        return;
+        return false;
     if (kind && inbound.subscriptionListKinds && !inbound.subscriptionListKinds.includes(kind))
+        return false;
+    return true;
+}
+function enqueueOwnerNotification(owner, notification, isCurrent) {
+    if (!allowsOwnedNotification(owner.inbound, notification))
         return;
-    const owner = getOwner(connections, inbound);
     const encoded = JSON.stringify(notification);
     const snapshot = structuredClone(notification);
     enqueue(owner, Buffer.byteLength(encoded), async () => {
         if (isCurrent && !isCurrent())
             return;
-        await inbound.adapter.notify({ method: snapshot.method, params: toJsonValue(snapshot.params ?? {}) });
+        await owner.inbound.adapter.notify({ method: snapshot.method, params: toJsonValue(snapshot.params ?? {}) });
     });
 }
 export async function subscribeOwnedResource(connections, inbound, uri, signal, authorize) {
@@ -551,6 +697,8 @@ export async function subscribeOwnedResource(connections, inbound, uri, signal,
         setupCount >= MAX_PROCESS_WATCHES) {
         throw new Error('Resource subscription admission limit exceeded');
     }
+    getProjectLifecycle()?.assertAdmission(projectPaths(owner.binding?.context ?? inbound.context));
+    retainProjectSubscription(owner);
     const watch = { owner, uri, abort: new AbortController(), active: true, ready: Promise.resolve(), authorize };
     owner.watches.set(uri, watch);
     watchCount++;
@@ -635,12 +783,16 @@ export async function subscribeOwnedResource(connections, inbound, uri, signal,
             signal?.removeEventListener('abort', cancel);
             setupCount--;
             owner.setups--;
+            releaseIdleProjectSubscription(owner);
         }
     })();
     return watch.ready;
 }
 export async function unsubscribeOwnedResource(inbound, uri) {
-    const watch = owners.get(inbound)?.watches.get(uri);
+    const watch = owners
+        .get(inbound)
+        ?.get(getRequestSession(inbound) ?? '')
+        ?.watches.get(uri);
     if (watch)
         await detach(watch);
 }