@1mcp/agent 0.38.0 → 0.38.2

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

@@ -3,11 +3,11 @@ import { acquireRuntimeCapabilityCatalog } from '../../../../core/capabilities/r
 import { getRequestSession, resolveCapabilityVisibility } from '../../../../core/protocol/requestHandlerUtils.js';
 import { ClientStatus, ServerStatus } from '../../../../core/types/index.js';
 import logger from '../../../../logger/logger.js';
-import { toJsonValue } from '../../../../sdk/contracts/index.js';
-import { getLegacyTransport, setOutboundNotificationHandler, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
-import { getLegacyInboundServer } from '../../../../sdk/legacy/server/runtime/legacyInboundConnection.js';
-import { projectResourceUri } from '../../../../sdk/legacy/shared/resourceTemplateRouting.js';
-import { CancelledNotificationSchema, LoggingMessageNotificationSchema, ProgressNotificationSchema, ResourceUpdatedNotificationSchema, RootsListChangedNotificationSchema, } from '../../../../sdk/legacy/types.js';
+import { toJsonValue } from '../../../contracts/index.js';
+import { getLegacyTransport, setOutboundNotificationHandler, } from '../../client/runtime/legacyOutboundConnection.js';
+import { getLegacyInboundServer } from '../runtime/legacyInboundConnection.js';
+import { projectResourceUri } from '../../shared/resourceTemplateRouting.js';
+import { CancelledNotificationSchema, LoggingMessageNotificationSchema, ProgressNotificationSchema, ResourceUpdatedNotificationSchema, RootsListChangedNotificationSchema, } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 function formatNotificationError(error) {
     return error instanceof Error ? `Error: ${error.message}` : String(error);

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

@@ -1,5 +1,5 @@
 import { InboundConnection } from '../../../../core/types/index.js';
-import { type LegacyOutboundConnections } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { type LegacyOutboundConnections } from '../../client/runtime/legacyOutboundConnection.js';
 export declare function registerPromptHandlers(outboundConns: LegacyOutboundConnections, inboundConn: InboundConnection): void;
 export declare function registerCompletionHandlers(outboundConns: LegacyOutboundConnections, inboundConn: InboundConnection): void;
 //# sourceMappingURL=promptRequestHandlers.d.ts.map

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

@@ -1,8 +1,8 @@
 import { acquireRuntimeCapabilityCatalog } from '../../../../core/capabilities/runtimeCapabilityCatalog.js';
 import { getRequestSession, resolveCapabilityVisibility } from '../../../../core/protocol/requestHandlerUtils.js';
-import { requestLegacyOutbound, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
-import { getLegacyInboundServer } from '../../../../sdk/legacy/server/runtime/legacyInboundConnection.js';
-import { CompleteRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema } from '../../../../sdk/legacy/types.js';
+import { requestLegacyOutbound, } from '../../client/runtime/legacyOutboundConnection.js';
+import { getLegacyInboundServer } from '../runtime/legacyInboundConnection.js';
+import { CompleteRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 export function registerPromptHandlers(outboundConns, inboundConn) {
     const acquire = (cursor) => acquireRuntimeCapabilityCatalog(outboundConns, resolveCapabilityVisibility(outboundConns, inboundConn, getRequestSession(inboundConn), 'prompts'), {

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

@@ -1,7 +1,7 @@
 import { LazyLoadingOrchestrator } from '../../../../core/capabilities/lazyLoadingOrchestrator.js';
 import { createCapabilityCatalogFromConnections, filterConnectionsForSession, getRequestSession, resolveOutboundConnection } from '../../../../core/protocol/requestHandlerUtils.js';
 import { InboundConnection } from '../../../../core/types/index.js';
-import { type LegacyOutboundConnections } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { type LegacyOutboundConnections } from '../../client/runtime/legacyOutboundConnection.js';
 export { createCapabilityCatalogFromConnections, filterConnectionsForSession, getRequestSession, resolveOutboundConnection, };
 /**
  * Registers all request handlers based on available capabilities

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

@@ -2,9 +2,9 @@ import { createCapabilityCatalogFromConnections, filterConnectionsForSession, ge
 import { ServerManager } from '../../../../core/server/serverManager.js';
 import { ClientStatus } from '../../../../core/types/index.js';
 import logger, { setLogLevel } from '../../../../logger/logger.js';
-import { getLegacyTransport, requestLegacyOutbound, setOutboundRequestHandler, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
-import { getLegacyInboundServer } from '../../../../sdk/legacy/server/runtime/legacyInboundConnection.js';
-import { CreateMessageRequestSchema, ElicitRequestSchema, ListRootsRequestSchema, PingRequestSchema, SetLevelRequestSchema, } from '../../../../sdk/legacy/types.js';
+import { getLegacyTransport, requestLegacyOutbound, setOutboundRequestHandler, } from '../../client/runtime/legacyOutboundConnection.js';
+import { getLegacyInboundServer } from '../runtime/legacyInboundConnection.js';
+import { CreateMessageRequestSchema, ElicitRequestSchema, ListRootsRequestSchema, PingRequestSchema, SetLevelRequestSchema, } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 import { getRequestTimeout } from '../../../../utils/core/timeoutUtils.js';
 import { registerCompletionHandlers, registerPromptHandlers } from './promptRequestHandlers.js';

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

@@ -1,4 +1,4 @@
 import { InboundConnection } from '../../../../core/types/index.js';
-import { type LegacyOutboundConnections } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { type LegacyOutboundConnections } from '../../client/runtime/legacyOutboundConnection.js';
 export declare function registerResourceHandlers(outboundConns: LegacyOutboundConnections, inboundConn: InboundConnection): void;
 //# sourceMappingURL=resourceRequestHandlers.d.ts.map

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

@@ -1,9 +1,9 @@
 import { acquireRuntimeCapabilityCatalog } from '../../../../core/capabilities/runtimeCapabilityCatalog.js';
 import { getRequestSession, resolveCapabilityVisibility } from '../../../../core/protocol/requestHandlerUtils.js';
-import { requestLegacyOutbound, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
-import { getLegacyInboundServer } from '../../../../sdk/legacy/server/runtime/legacyInboundConnection.js';
-import { projectResourceUri, resolveResourceRoute } from '../../../../sdk/legacy/shared/resourceTemplateRouting.js';
-import { ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, } from '../../../../sdk/legacy/types.js';
+import { requestLegacyOutbound, } from '../../client/runtime/legacyOutboundConnection.js';
+import { getLegacyInboundServer } from '../runtime/legacyInboundConnection.js';
+import { projectResourceUri, resolveResourceRoute } from '../../shared/resourceTemplateRouting.js';
+import { ListResourcesRequestSchema, ListResourceTemplatesRequestSchema, ReadResourceRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 export function registerResourceHandlers(outboundConns, inboundConn) {
     const acquire = (cursor, kind = 'resources') => acquireRuntimeCapabilityCatalog(outboundConns, resolveCapabilityVisibility(outboundConns, inboundConn, getRequestSession(inboundConn), 'resources'), { continuation: cursor ? { kind, cursor, enablePagination: inboundConn.enablePagination ?? false } : undefined });

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

@@ -1,5 +1,5 @@
 import { LazyLoadingOrchestrator } from '../../../../core/capabilities/lazyLoadingOrchestrator.js';
 import { InboundConnection } from '../../../../core/types/index.js';
-import { type LegacyOutboundConnections } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { type LegacyOutboundConnections } from '../../client/runtime/legacyOutboundConnection.js';
 export declare function registerToolHandlers(outboundConns: LegacyOutboundConnections, inboundConn: InboundConnection, lazyLoadingOrchestrator?: LazyLoadingOrchestrator): void;
 //# sourceMappingURL=toolRequestHandlers.d.ts.map

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

@@ -4,9 +4,9 @@ import { acquireRuntimeCapabilityCatalog } from '../../../../core/capabilities/r
 import { executeWithPostAuthOAuthRecovery } from '../../../../core/client/postAuthOAuthRecovery.js';
 import { getRequestSession, resolveCapabilityVisibility, resolveLazyCapabilityVisibility, } from '../../../../core/protocol/requestHandlerUtils.js';
 import { getDisabledSourceToolError } from '../../../../core/server/disabledTools.js';
-import { requestLegacyOutbound, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
-import { getLegacyInboundServer } from '../../../../sdk/legacy/server/runtime/legacyInboundConnection.js';
-import { CallToolRequestSchema, ListToolsRequestSchema } from '../../../../sdk/legacy/types.js';
+import { requestLegacyOutbound, } from '../../client/runtime/legacyOutboundConnection.js';
+import { getLegacyInboundServer } from '../runtime/legacyInboundConnection.js';
+import { CallToolRequestSchema, ListToolsRequestSchema } from '../../types.js';
 import { withErrorHandling } from '../../../../utils/core/errorHandling.js';
 export function registerToolHandlers(outboundConns, inboundConn, lazyLoadingOrchestrator) {
     const sessionId = getRequestSession(inboundConn);

package/build/sdk/legacy/server/runtime/clientInstancePoolTypes.d.ts

@@ -1,7 +1,7 @@
 import type { BackendStdioSupervisor, BackendSupervisionSnapshot } from '../../../../core/server/backendStdioSupervisor.js';
 import type { MCPServerParams } from '../../../../core/types/transport.js';
-import type { Client } from '../../../../sdk/legacy/client/index.js';
-import type { AuthProviderTransport } from '../../../../sdk/legacy/client/runtime/legacyTransport.js';
+import type { Client } from '../../client/index.js';
+import type { AuthProviderTransport } from '../../client/runtime/legacyTransport.js';
 /**
  * Configuration options for client instance pool
  */

package/build/sdk/legacy/server/runtime/connectionManager.d.ts

@@ -1,7 +1,7 @@
 import { LazyLoadingOrchestrator } from '../../../../core/capabilities/lazyLoadingOrchestrator.js';
 import type { OutboundConnections } from '../../../../core/types/client.js';
 import { InboundConnection, InboundConnectionConfig, OperationOptions } from '../../../../core/types/index.js';
-import { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import { Transport } from '../../shared/transport.js';
 import type { ContextData } from '../../../../types/context.js';
 import { type LegacyInboundConnection } from './legacyInboundConnection.js';
 /**

package/build/sdk/legacy/server/runtime/connectionManager.js

@@ -5,8 +5,8 @@ import { ServerStatus } from '../../../../core/types/index.js';
 import { PresetNotificationService, } from '../../../../domains/preset/services/presetNotificationService.js';
 import logger, { debugIf } from '../../../../logger/logger.js';
 import { enhanceServerWithLogging } from '../../../../logger/mcpLoggingEnhancer.js';
-import { toJsonValue } from '../../../../sdk/contracts/jsonValue.js';
-import { Server } from '../../../../sdk/legacy/server/index.js';
+import { toJsonValue } from '../../../contracts/jsonValue.js';
+import { Server } from '../index.js';
 import { executeOperation } from '../../../../utils/core/operationExecution.js';
 import { requireLegacyInboundConnection, toInboundConnectionError, } from './legacyInboundConnection.js';
 import { getLegacyServerTransportHandle, isLegacyServerConnected, LegacySdkServerAdapter, } from './legacySdkServerAdapter.js';

package/build/sdk/legacy/server/runtime/legacyInboundConnection.d.ts

@@ -1,6 +1,6 @@
 import type { InboundConnection, InboundConnectionError, ServerStatus } from '../../../../core/types/server.js';
-import type { LegacyConnectionId } from '../../../../sdk/contracts/legacySdkAdapter.js';
-import type { Server } from '../../../../sdk/legacy/server/index.js';
+import type { LegacyConnectionId } from '../../../contracts/legacySdkAdapter.js';
+import type { Server } from '../index.js';
 import { LegacySdkServerAdapter } from './legacySdkServerAdapter.js';
 /** Internal connection shape. Never re-export this type through a shared compatibility path. */
 export interface LegacyInboundConnection extends Omit<InboundConnection, 'status' | 'lastError' | 'lastConnected' | 'connectedAt'> {

package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.d.ts

@@ -1,7 +1,7 @@
 import type { InboundConnectionAdapter } from '../../../../core/types/server.js';
-import type { LegacyConnectionId, LegacySdkLifecycleState, LegacySdkNotification } from '../../../../sdk/contracts/legacySdkAdapter.js';
-import type { Server } from '../../../../sdk/legacy/server/index.js';
-import type { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import type { LegacyConnectionId, LegacySdkLifecycleState, LegacySdkNotification } from '../../../contracts/legacySdkAdapter.js';
+import type { Server } from '../index.js';
+import type { Transport } from '../../shared/transport.js';
 /** Owns the live v1 SDK server and transport inside the legacy runtime island. */
 export declare class LegacySdkServerAdapter implements InboundConnectionAdapter {
     readonly connectionId: LegacyConnectionId;

package/build/sdk/legacy/server/runtime/legacySdkServerAdapter.js

@@ -1,5 +1,5 @@
-import { toJsonValue } from '../../../../sdk/contracts/jsonValue.js';
-import { OneMcpProtocolError } from '../../../../sdk/contracts/oneMcpProtocolError.js';
+import { toJsonValue } from '../../../contracts/jsonValue.js';
+import { OneMcpProtocolError } from '../../../contracts/oneMcpProtocolError.js';
 const serverHandles = new WeakMap();
 function toProtocolError(error) {
     try {

package/build/sdk/legacy/server/runtime/mcpLoggingEnhancer.d.ts

@@ -1,4 +1,4 @@
-import { Server } from '../../../../sdk/legacy/server/index.js';
+import { Server } from '../index.js';
 /**
  * Enhances an MCP server with request/response logging
  */

package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.d.ts

@@ -1,7 +1,7 @@
 import type { OutboundConnections } from '../../../../core/types/client.js';
 import { MCPServerParams } from '../../../../core/types/index.js';
-import type { AuthProviderTransport } from '../../../../sdk/legacy/client/runtime/legacyTransport.js';
-import { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import type { AuthProviderTransport } from '../../client/runtime/legacyTransport.js';
+import { Transport } from '../../shared/transport.js';
 /**
  * Manages the lifecycle of MCP server instances (start, stop, restart)
  */

package/build/sdk/legacy/server/runtime/mcpServerLifecycleManager.js

@@ -2,7 +2,7 @@ import { sanitizeRuntimeScopeError } from '../../../../config/runtimeScopeEnv.js
 import { ClientManager } from '../../../../core/client/clientManager.js';
 import { getGlobalContextManager } from '../../../../core/context/globalContextManager.js';
 import logger, { debugIf } from '../../../../logger/logger.js';
-import { getLegacyTransport } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { getLegacyTransport } from '../../client/runtime/legacyOutboundConnection.js';
 import { createTransports, createTransportsWithContext, inferTransportType } from '../../../../transport/transportFactory.js';
 /**
  * Manages the lifecycle of MCP server instances (start, stop, restart)

package/build/sdk/legacy/server/runtime/requestContextPreparation.d.ts

@@ -2,7 +2,7 @@ import type { TrustedTemplateContext } from '../../../../core/context/templateCo
 import type { OutboundConnections } from '../../../../core/types/client.js';
 import type { MCPServerParams } from '../../../../core/types/index.js';
 import type { InboundConnectionConfig } from '../../../../core/types/server.js';
-import type { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import type { Transport } from '../../shared/transport.js';
 import type { ContextData } from '../../../../types/context.js';
 export type RequestContextPreparationResult = {
     status: 'no_context';

package/build/sdk/legacy/server/runtime/serverManager.d.ts

@@ -4,7 +4,7 @@ import { InstructionAggregator } from '../../../../core/instructions/instruction
 import { ServerRegistry } from '../../../../core/server/adapters/ServerRegistry.js';
 import { TemplateServerManager } from '../../../../core/server/templateServerManager.js';
 import type { InboundConnection, InboundConnectionConfig, MCPServerParams, OperationOptions, OutboundConnection, OutboundConnections } from '../../../../core/types/index.js';
-import { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import { Transport } from '../../shared/transport.js';
 import type { ContextData } from '../../../../types/context.js';
 /**
  * Event data for context change events

package/build/sdk/legacy/server/runtime/serverManager.js

@@ -11,7 +11,7 @@ import { TemplateConfigurationManager } from '../../../../core/server/templateCo
 import { TemplateServerManager } from '../../../../core/server/templateServerManager.js';
 import { ClientStatus } from '../../../../core/types/index.js';
 import logger, { debugIf } from '../../../../logger/logger.js';
-import { getLegacyTransport } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { getLegacyTransport } from '../../client/runtime/legacyOutboundConnection.js';
 /**
  * Refactored ServerManager that coordinates various server management components
  *

package/build/sdk/legacy/server/runtime/templateServerCleanup.d.ts

@@ -1,7 +1,7 @@
 import type { ClientTemplateTracker } from '../../../../core/filtering/index.js';
 import type { ClientInstancePool } from '../../../../core/server/clientInstancePool.js';
 import type { OutboundConnections } from '../../../../core/types/client.js';
-import type { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import type { Transport } from '../../shared/transport.js';
 export interface EphemeralTemplateClient {
     templateName: string;
     instanceId: string;

package/build/sdk/legacy/server/runtime/templateServerManager.d.ts

@@ -6,7 +6,7 @@ import { type TemplateInstancePoolPolicy } from '../../../../core/server/clientI
 import type { OutboundConnections } from '../../../../core/types/client.js';
 import { MCPServerParams } from '../../../../core/types/index.js';
 import type { InboundConnectionConfig } from '../../../../core/types/server.js';
-import { Transport } from '../../../../sdk/legacy/shared/transport.js';
+import { Transport } from '../../shared/transport.js';
 import type { ContextData } from '../../../../types/context.js';
 /**
  * Options for rebuilding the template index

package/build/sdk/legacy/server/runtime/templateServerManager.js

@@ -12,7 +12,7 @@ import { createRenderedIdentity, createSessionIdentity, resolveTemplateIdentityM
 import { cleanupExpiredEphemeralClients, cleanupTemplateServersForSession, } from '../../../../core/server/templateServerCleanup.js';
 import { ClientStatus } from '../../../../core/types/client.js';
 import logger, { debugIf } from '../../../../logger/logger.js';
-import { createLegacyOutboundConnection, getLegacyClient, } from '../../../../sdk/legacy/client/runtime/legacyOutboundConnection.js';
+import { createLegacyOutboundConnection, getLegacyClient, } from '../../client/runtime/legacyOutboundConnection.js';
 /**
  * Manages template-based server instances and client pools
  */

package/build/sdk/legacy/shared/capabilityListCapture.d.ts

@@ -1,4 +1,4 @@
-import { type JsonValue } from '../../../sdk/contracts/index.js';
+import { type JsonValue } from '../../contracts/index.js';
 /** Keep malformed template syntax local to one catalog source capability. */
 export declare function captureCapabilityListResult(method: string, result: unknown): JsonValue;
 //# sourceMappingURL=capabilityListCapture.d.ts.map

package/build/sdk/legacy/shared/capabilityListCapture.js

@@ -1,5 +1,5 @@
 import { UriTemplate } from '@modelcontextprotocol/sdk/shared/uriTemplate.js';
-import { toJsonValue } from '../../../sdk/contracts/index.js';
+import { toJsonValue } from '../../contracts/index.js';
 /** Keep malformed template syntax local to one catalog source capability. */
 export function captureCapabilityListResult(method, result) {
     const captured = toJsonValue(result);

package/build/sdk/legacy/transport/http/loggingSseTransport.d.ts

@@ -1,6 +1,6 @@
 import { ServerResponse } from 'node:http';
-import { SSEServerTransport } from '../../../../sdk/legacy/server/sse.js';
-import { JSONRPCMessage } from '../../../../sdk/legacy/types.js';
+import { SSEServerTransport } from '../../server/sse.js';
+import { JSONRPCMessage } from '../../types.js';
 /**
  * SSE transport wrapper that logs JSON-RPC error responses.
  * JSON-RPC errors are sent via SSE with HTTP 200 status, so we need

package/build/sdk/legacy/transport/http/loggingSseTransport.js

@@ -1,5 +1,5 @@
 import { AgentConfigManager } from '../../../../core/server/agentConfig.js';
-import { SSEServerTransport } from '../../../../sdk/legacy/server/sse.js';
+import { SSEServerTransport } from '../../server/sse.js';
 import { logJsonRpc } from '../../../../transport/http/utils/unifiedLogger.js';
 /**
  * SSE transport wrapper that logs JSON-RPC error responses.

package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts

@@ -2,7 +2,7 @@ import { SDKOAuthServerProvider } from '../../../../../auth/sdkOAuthServerProvid
 import type { FilterSelection } from '../../../../../core/filtering/filterSelection.js';
 import { TagExpression } from '../../../../../domains/preset/parsers/tagQueryParser.js';
 import { TagQuery } from '../../../../../domains/preset/types/presetTypes.js';
-import type { AuthInfo as SDKAuthInfo } from '../../../../../sdk/legacy/server/auth/types.js';
+import type { AuthInfo as SDKAuthInfo } from '../../../server/auth/types.js';
 import { NextFunction, Request, Response } from 'express';
 declare global {
     namespace Express {

package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js

@@ -1,7 +1,7 @@
 import { SDKOAuthServerProvider } from '../../../../../auth/sdkOAuthServerProvider.js';
 import { AgentConfigManager } from '../../../../../core/server/agentConfig.js';
 import logger from '../../../../../logger/logger.js';
-import { requireBearerAuth } from '../../../../../sdk/legacy/server/auth/middleware/bearerAuth.js';
+import { requireBearerAuth } from '../../../server/auth/middleware/bearerAuth.js';
 import { auditScopeOperation, hasRequiredScopes, scopesToTags } from '../../../../../utils/validation/scopeValidation.js';
 /**
  * Creates a scope validation middleware that uses the SDK's bearer auth middleware

package/build/sdk/legacy/transport/http/modernInboundLegacyBridge.js

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
 import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
 import { LegacyOutboundEraAdapter } from '../../../../gateway/adapters/legacy/legacyOutboundEraAdapter.js';
-import { Client } from '../../../../sdk/legacy/client/index.js';
-import { LegacySdkClientAdapter } from '../../../../sdk/legacy/client/runtime/legacySdkClientAdapter.js';
+import { Client } from '../../client/index.js';
+import { LegacySdkClientAdapter } from '../../client/runtime/legacySdkClientAdapter.js';
 const LEGACY_REVISION = '2025-11-25';
 /**
  * Gives one modern stateless exchange a private connection to the existing

package/build/sdk/legacy/transport/http/restorableStreamableTransport.d.ts

@@ -1,4 +1,4 @@
-import { StreamableHTTPServerTransport } from '../../../../sdk/legacy/server/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '../../server/streamableHttp.js';
 /**
  * Metadata about a transport's restoration state, used for debugging
  * and monitoring session restoration flow.

package/build/sdk/legacy/transport/http/restorableStreamableTransport.js

@@ -1,4 +1,4 @@
-import { StreamableHTTPServerTransport } from '../../../../sdk/legacy/server/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '../../server/streamableHttp.js';
 /**
  * RestorableStreamableHTTPServerTransport extends the MCP SDK's StreamableHTTPServerTransport
  * to track whether a transport was restored from persistent storage.

package/build/sdk/legacy/transport/http/routes/sseRoutes.js

@@ -1,7 +1,7 @@
 import { MESSAGES_ENDPOINT, SSE_ENDPOINT } from '../../../../../constants.js';
 import logger from '../../../../../logger/logger.js';
-import { SSEServerTransport } from '../../../../../sdk/legacy/server/sse.js';
-import { ErrorCode } from '../../../../../sdk/legacy/types.js';
+import { SSEServerTransport } from '../../../server/sse.js';
+import { ErrorCode } from '../../../types.js';
 import { LoggingSSEServerTransport } from '../../../../../transport/http/loggingSseTransport.js';
 import { getPresetName, getTagExpression, getTagFilterMode, getTagQuery, getValidatedTags, } from '../../../../../transport/http/middlewares/scopeAuthMiddleware.js';
 import tagsExtractor from '../../../../../transport/http/middlewares/tagsExtractor.js';

package/build/sdk/legacy/transport/http/server.js

@@ -19,8 +19,8 @@ import { getBackendLogBroker } from '../../../../domains/backend-logs/backendLog
 import { createConfigChangeService } from '../../../../domains/config-change/configChange.js';
 import { PresetManager } from '../../../../domains/preset/manager/presetManager.js';
 import logger from '../../../../logger/logger.js';
-import { mcpAuthRouter } from '../../../../sdk/legacy/server/auth/router.js';
-import { createModernInboundLegacyBridge } from '../../../../sdk/legacy/transport/http/modernInboundLegacyBridge.js';
+import { mcpAuthRouter } from '../../server/auth/router.js';
+import { createModernInboundLegacyBridge } from './modernInboundLegacyBridge.js';
 import errorHandler from '../../../../transport/http/middlewares/errorHandler.js';
 import { httpRequestLogger } from '../../../../transport/http/middlewares/httpRequestLogger.js';
 import { createMcpAvailabilityMiddleware } from '../../../../transport/http/middlewares/mcpAvailabilityMiddleware.js';

package/build/sdk/legacy/transport/http/streamableSessionLifecycle.d.ts

@@ -3,7 +3,7 @@ import { AsyncLoadingOrchestrator } from '../../../../core/capabilities/asyncLoa
 import type { TemplateContextProof } from '../../../../core/context/templateContextTrust.js';
 import { ServerManager } from '../../../../core/server/serverManager.js';
 import { InboundConnectionConfig } from '../../../../core/types/index.js';
-import { StreamableHTTPServerTransport } from '../../../../sdk/legacy/server/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '../../server/streamableHttp.js';
 import { RestorableStreamableHTTPServerTransport } from '../../../../transport/http/restorableStreamableTransport.js';
 import { StreamableSessionRepository } from '../../../../transport/http/storage/streamableSessionRepository.js';
 import type { ContextData } from '../../../../types/context.js';

package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { AUTH_CONFIG } from '../../../../constants.js';
 import logger from '../../../../logger/logger.js';
-import { StreamableHTTPServerTransport } from '../../../../sdk/legacy/server/streamableHttp.js';
+import { StreamableHTTPServerTransport } from '../../server/streamableHttp.js';
 import { RestorableStreamableHTTPServerTransport } from '../../../../transport/http/restorableStreamableTransport.js';
 import { authorizeRequestTemplateContext } from '../../../../transport/http/utils/templateContextAuthority.js';
 import { logError } from '../../../../transport/http/utils/unifiedLogger.js';

package/build/sdk/legacy/transport/restartableStdioTransport.d.ts

@@ -1,7 +1,7 @@
 import { Stream } from 'node:stream';
-import { StdioServerParameters } from '../../../sdk/legacy/client/stdio.js';
-import { Transport } from '../../../sdk/legacy/shared/transport.js';
-import { JSONRPCMessage } from '../../../sdk/legacy/types.js';
+import { StdioServerParameters } from '../client/stdio.js';
+import { Transport } from '../shared/transport.js';
+import { JSONRPCMessage } from '../types.js';
 import { ManagedStdioStderr } from '../../../transport/managedStdioStderr.js';
 /**
  * Configuration for the restartable stdio transport

package/build/sdk/legacy/transport/restartableStdioTransport.js

@@ -1,5 +1,5 @@
 import logger, { debugIf } from '../../../logger/logger.js';
-import { StdioClientTransport } from '../../../sdk/legacy/client/stdio.js';
+import { StdioClientTransport } from '../client/stdio.js';
 /**
  * Wrapper around StdioClientTransport that provides automatic restart functionality
  * Implements Transport interface and adds OAuth provider support

package/build/sdk/legacy/transport/stdioProxyTransport.js

@@ -3,8 +3,8 @@ import { buildCliContext, generateStreamableSessionId } from '../../../commands/
 import { MCP_SERVER_VERSION } from '../../../constants/mcp.js';
 import { classifyProtocolEra, createGatewayFailure, } from '../../../gateway/contracts/index.js';
 import logger from '../../../logger/logger.js';
-import { toProtocolJSONRPCMessage } from '../../../sdk/contracts/index.js';
-import { StdioServerTransport } from '../../../sdk/legacy/server/stdio.js';
+import { toProtocolJSONRPCMessage } from '../../contracts/index.js';
+import { StdioServerTransport } from '../server/stdio.js';
 import { ClientInfoExtractor } from '../../../utils/client/clientInfoExtractor.js';
 /**
  * Generate a secure mcp-session-id for the proxy with the correct prefix

package/build/sdk/legacy/transport/transportFactory.js

@@ -11,9 +11,9 @@ import { createBackendLogProjection } from '../../../domains/backend-logs/backen
 import { getBackendLogBroker } from '../../../domains/backend-logs/backendLogRuntime.js';
 import { staticBackendLogSource } from '../../../domains/backend-logs/backendLogSource.js';
 import logger, { debugIf } from '../../../logger/logger.js';
-import { SSEClientTransport } from '../../../sdk/legacy/client/sse.js';
-import { StdioClientTransport } from '../../../sdk/legacy/client/stdio.js';
-import { StreamableHTTPClientTransport, } from '../../../sdk/legacy/client/streamableHttp.js';
+import { SSEClientTransport } from '../client/sse.js';
+import { StdioClientTransport } from '../client/stdio.js';
+import { StreamableHTTPClientTransport, } from '../client/streamableHttp.js';
 import { HandlebarsTemplateRenderer } from '../../../template/handlebarsTemplateRenderer.js';
 import { ManagedStdioStderr } from '../../../transport/managedStdioStderr.js';
 import { ZodError } from 'zod';

package/build/sdk/legacy/validation/CustomJsonSchemaValidator.d.ts

@@ -1,4 +1,4 @@
-import type { JsonSchemaValidator, jsonSchemaValidator } from '../../../sdk/legacy/validation.js';
+import type { JsonSchemaValidator, jsonSchemaValidator } from '../validation.js';
 /**
  * Custom validator that handles problematic schemas gracefully
  */

package/build/transport/http/middlewares/httpRequestLogger.js

@@ -1,5 +1,5 @@
 import logger from '../../../logger/logger.js';
-import { redactTemplateContextBodyForLogging, redactTemplateContextQueryForLogging, } from '../../../transport/http/utils/templateContextAuthority.js';
+import { redactTemplateContextBodyForLogging, redactTemplateContextQueryForLogging, } from '../utils/templateContextAuthority.js';
 import { sanitizeHeaders } from '../../../utils/validation/sanitization.js';
 /**
  * HTTP request logging middleware that provides comprehensive request/response logging

package/build/transport/http/middlewares/tagsExtractor.js

@@ -2,7 +2,7 @@ import { resolveFilterSelection } from '../../../core/filtering/filterSelection.
 import { PresetManager } from '../../../domains/preset/manager/presetManager.js';
 import logger from '../../../logger/logger.js';
 import { ErrorCode } from '../../../sdk/contracts/index.js';
-import { sendBadRequest } from '../../../transport/http/utils/httpErrorHandler.js';
+import { sendBadRequest } from '../utils/httpErrorHandler.js';
 /**
  * Middleware to extract and validate tag filters from query parameters.
  * Supports:

package/build/transport/http/routes/adminRoutes.d.ts

@@ -8,7 +8,7 @@ import type { AdminOAuthOperations } from '../../../domains/admin/adminOAuthServ
 import { type AdminPresetOperations } from '../../../domains/admin/adminPresetService.js';
 import type { AdminMutationAvailability } from '../../../domains/admin/runtimeScopeAdminLock.js';
 import type { BackendLogBroker } from '../../../domains/backend-logs/backendLogBroker.js';
-import { type SensitiveOperationRateLimitPolicy } from '../../../transport/http/middlewares/securityMiddleware.js';
+import { type SensitiveOperationRateLimitPolicy } from '../middlewares/securityMiddleware.js';
 import { Router } from 'express';
 export interface AdminRateLimitPolicy {
     login: {
@@ -54,5 +54,7 @@ export declare class FailedLoginLimiter {
     private key;
     private pruneExpired;
 }
+/** Only authenticated, CSRF-checked browser requests can supply this origin. */
+export declare function trustedAdminReturnOrigin(origin: string | undefined, externalUrl: string): string | undefined;
 export {};
 //# sourceMappingURL=adminRoutes.d.ts.map

package/build/transport/http/routes/adminRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/adminRoutes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAEvF,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E,OAAO,KAAK,EACV,6BAA6B,EAI9B,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAGL,KAAK,+BAA+B,EACrC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAIL,oBAAoB,EACrB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAEL,KAAK,kCAAkC,EACxC,MAAM,uDAAuD,CAAC;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAMpF,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+CAA+C,CAAC;AAQtF,OAAO,EAGL,KAAK,iCAAiC,EACvC,MAAM,uDAAuD,CAAC;AAG/D,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAqI7D,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,SAAS,EAAE,iCAAiC,CAAC;CAC9C;AAED,eAAO,MAAM,+BAA+B,EAAE,oBAW7C,CAAC;AAEF,UAAU,kBAAkB;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,oBAAoB,CAAC;IACnC,uBAAuB,CAAC,EAAE,+BAA+B,CAAC;IAC1D,0BAA0B,CAAC,EAAE,kCAAkC,CAAC;IAChE,qBAAqB,CAAC,EAAE,6BAA6B,CAAC;IACtD,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;IACtD,kBAAkB,EAAE,MAAM,eAAe,CAAC;IAC1C,iBAAiB,CAAC,EAAE,MAAM,2BAA2B,CAAC;IACtD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mBAAmB,CAAC,EAAE,MAAM,gBAAgB,CAAC;IAC7C,SAAS,CAAC,EAAE,oBAAoB,CAAC;CAClC;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,GAAG,IAAI,CAukB5E;AAqQD,wBAAgB,mCAAmC,IAAI,MAAM,CAE5D;AA80BD,qBAAa,kBAAkB;IAI3B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgE;gBAGtE,GAAG,GAAE,MAAM,MAAiB,EAC5B,aAAa,SAA+B,EAC5C,QAAQ,SAAyB,EACjC,iBAAiB,SAAqB;IAGzD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IASpD,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAWrD,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7C,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,YAAY;CAQrB"}
+{"version":3,"file":"adminRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/adminRoutes.ts"],"names":[],"mappings":"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"}

package/build/transport/http/routes/adminRoutes.js

@@ -8,7 +8,7 @@ import { AdminConfiguredServerApplyError, AdminConfiguredServerNotFoundError, }
 import { ADMIN_SESSION_COOKIE_NAME, AdminIdentityError, } from '../../../domains/admin/adminIdentityService.js';
 import { AdminInstructionTemplateNotFoundError, } from '../../../domains/admin/adminInstructionTemplateService.js';
 import { AdminPresetConflictError, AdminPresetNotFoundError, } from '../../../domains/admin/adminPresetService.js';
-import { createSensitiveOperationLimiter, DEFAULT_SENSITIVE_OPERATION_RATE_LIMIT_POLICY, } from '../../../transport/http/middlewares/securityMiddleware.js';
+import { createSensitiveOperationLimiter, DEFAULT_SENSITIVE_OPERATION_RATE_LIMIT_POLICY, } from '../middlewares/securityMiddleware.js';
 import { sanitizeErrorMessage } from '../../../utils/validation/sanitization.js';
 import express, { Router } from 'express';
 import rateLimit from 'express-rate-limit';
@@ -35,6 +35,18 @@ const adminLoginBodySchema = z.object({
     username: z.string().trim().min(1).max(ADMIN_USERNAME_MAX_LENGTH),
     password: z.string().min(1).max(ADMIN_PASSWORD_MAX_LENGTH),
 });
+const adminOAuthReturnOriginSchema = z
+    .string()
+    .refine((value) => {
+    try {
+        const url = new URL(value);
+        return value === url.origin;
+    }
+    catch {
+        return false;
+    }
+}, 'Expected a canonical HTTP(S) origin')
+    .pipe(z.url({ protocol: /^https?$/ }));
 const adminOAuthServiceParamsSchema = z.object({
     serviceId: z.string().trim().min(1).max(256),
 });
@@ -405,6 +417,7 @@ export function createAdminRoutes(options) {
         const result = await options.oauthService.authorizeService({
             context: buildAdminOperationContext(req, options, { type: 'backend_oauth_service', id: serviceId }),
             serviceId,
+            adminReturnOrigin: trustedAdminReturnOrigin(req.header('Origin'), options.getRuntimeIdentity().externalUrl),
         });
         sendAdminOAuthOperationResult(res, result);
     });
@@ -419,6 +432,7 @@ export function createAdminRoutes(options) {
         const result = await options.oauthService.restartService({
             context: buildAdminOperationContext(req, options, { type: 'backend_oauth_service', id: serviceId }),
             serviceId,
+            adminReturnOrigin: trustedAdminReturnOrigin(req.header('Origin'), options.getRuntimeIdentity().externalUrl),
         });
         sendAdminOAuthOperationResult(res, result);
     });
@@ -2331,4 +2345,25 @@ function isLoopbackRuntimeUrl(value) {
         return false;
     }
 }
+/** Only authenticated, CSRF-checked browser requests can supply this origin. */
+export function trustedAdminReturnOrigin(origin, externalUrl) {
+    const parsed = adminOAuthReturnOriginSchema.safeParse(origin);
+    if (!parsed.success)
+        return undefined;
+    try {
+        const candidate = new URL(parsed.data);
+        const configured = new URL(externalUrl);
+        const loopback = new Set(['localhost', '127.0.0.1', '[::1]']);
+        if (candidate.origin === configured.origin ||
+            (loopback.has(candidate.hostname) &&
+                loopback.has(configured.hostname) &&
+                candidate.protocol === configured.protocol &&
+                candidate.port === configured.port))
+            return candidate.origin;
+    }
+    catch {
+        /* Invalid origins use the callback-local fallback. */
+    }
+    return undefined;
+}
 //# sourceMappingURL=adminRoutes.js.map