@1mcp/agent 0.29.0-beta5 → 0.29.0-beta7

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

@@ -1,11 +1,23 @@
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 /**
- * Information about the restoration state of a transport
+ * Metadata about a transport's restoration state, used for debugging
+ * and monitoring session restoration flow.
  */
 export interface RestorationInfo {
     isRestored: boolean;
     sessionId?: string;
 }
+/**
+ * Result type for operations that may fail.
+ * Uses discriminated union to make invalid states unrepresentable.
+ */
+export type OperationResult = {
+    success: true;
+    error?: never;
+} | {
+    success: false;
+    error: string;
+};
 /**
  * RestorableStreamableHTTPServerTransport extends the MCP SDK's StreamableHTTPServerTransport
  * to provide proper session restoration capabilities with type-safe access to internal properties.
@@ -13,22 +25,55 @@ export interface RestorationInfo {
  * This wrapper class encapsulates the initialization logic needed for restored sessions,
  * providing a clean interface that's less likely to break with SDK updates.
  *
+ * @remarks
+ * The class works by:
+ * 1. Storing a restored sessionId that overrides the SDK's getter
+ * 2. Providing methods to safely access and modify internal SDK properties
+ * 3. Returning success/failure status from operations for proper error handling
+ *
  * @example
  * ```typescript
- * // For session restoration
+ * // SessionService handles the full restoration flow:
  * const transport = new RestorableStreamableHTTPServerTransport({
- *   sessionIdGenerator: () => sessionId,
+ *   sessionIdGenerator: () => originalSessionId,
  * });
- * transport.markAsInitialized();
- *
- * // Check if session was restored
- * if (transport.isRestored()) {
- *   // Handle restored session logic
- * }
+ * const initResult = transport.markAsInitialized();
+ * transport.setSessionId(originalSessionId);
+ * // Now transport.isRestored() returns true
  * ```
  */
 export declare class RestorableStreamableHTTPServerTransport extends StreamableHTTPServerTransport {
     private _isRestored;
+    private _restoredSessionId?;
+    /**
+     * Sets the sessionId for a restored session.
+     *
+     * When restoring a session, we need to ensure the sessionId is available immediately
+     * without waiting for the sessionIdGenerator to be called by the SDK. This method
+     * directly sets the sessionId on the underlying transport.
+     *
+     * @param sessionId - The sessionId to set for the restored session
+     * @returns OperationResult indicating success or failure with error details
+     */
+    setSessionId(sessionId: string): OperationResult;
+    /**
+     * Override sessionId getter to return restored sessionId if available.
+     *
+     * This ensures that even if the underlying transport hasn't generated the sessionId yet,
+     * we return the correct restored sessionId. If no restored session ID exists, delegates
+     * to the parent class's getter by manually accessing the property descriptor.
+     *
+     * @remarks
+     * We cannot use `super.sessionId` directly because this override shadows the parent's
+     * getter. Instead, we use Object.getOwnPropertyDescriptor to access the parent's
+     * property descriptor and call its getter with the correct context.
+     *
+     * Type assertion to `object` is safe here because we know the prototype chain exists:
+     * this -> RestorableStreamableHTTPServerTransport -> StreamableHTTPServerTransport -> Object.prototype
+     * Object.getOwnPropertyDescriptor requires an object type, and TypeScript cannot infer this
+     * from the double getPrototypeOf call.
+     */
+    get sessionId(): string | undefined;
     /**
      * Marks the transport as initialized for restored sessions.
      *
@@ -37,9 +82,9 @@ export declare class RestorableStreamableHTTPServerTransport extends StreamableH
      * The MCP SDK checks the _initialized flag and rejects requests if it's false.
      * This method safely sets that flag to allow the restored session to work.
      *
-     * @throws Will log a warning if initialization fails but won't throw an error
+     * @returns OperationResult indicating success or failure with error details
      */
-    markAsInitialized(): void;
+    markAsInitialized(): OperationResult;
     /**
      * Returns whether this transport was created for a restored session.
      *

package/build/transport/http/restorableStreamableTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restorableStreamableTransport.d.ts","sourceRoot":"","sources":["../../../src/transport/http/restorableStreamableTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAInG;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,uCAAwC,SAAQ,6BAA6B;IACxF,OAAO,CAAC,WAAW,CAAS;IAE5B;;;;;;;;;OASG;IACH,iBAAiB,IAAI,IAAI;IAuBzB;;;;OAIG;IACH,UAAU,IAAI,OAAO;IAIrB;;;;OAIG;IACH,kBAAkB,IAAI,eAAe;CAatC"}
+{"version":3,"file":"restorableStreamableTransport.d.ts","sourceRoot":"","sources":["../../../src/transport/http/restorableStreamableTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAKnG;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnG;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,uCAAwC,SAAQ,6BAA6B;IACxF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC;;;;;;;;;OASG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe;IAwBhD;;;;;;;;;;;;;;;;OAgBG;IACH,IAAa,SAAS,IAAI,MAAM,GAAG,SAAS,CAiB3C;IAED;;;;;;;;;OASG;IACH,iBAAiB,IAAI,eAAe;IAyBpC;;;;OAIG;IACH,UAAU,IAAI,OAAO;IAIrB;;;;OAIG;IACH,kBAAkB,IAAI,eAAe;CAUtC"}

package/build/transport/http/restorableStreamableTransport.js

@@ -7,22 +7,95 @@ import logger from '../../logger/logger.js';
  * This wrapper class encapsulates the initialization logic needed for restored sessions,
  * providing a clean interface that's less likely to break with SDK updates.
  *
+ * @remarks
+ * The class works by:
+ * 1. Storing a restored sessionId that overrides the SDK's getter
+ * 2. Providing methods to safely access and modify internal SDK properties
+ * 3. Returning success/failure status from operations for proper error handling
+ *
  * @example
  * ```typescript
- * // For session restoration
+ * // SessionService handles the full restoration flow:
  * const transport = new RestorableStreamableHTTPServerTransport({
- *   sessionIdGenerator: () => sessionId,
+ *   sessionIdGenerator: () => originalSessionId,
  * });
- * transport.markAsInitialized();
- *
- * // Check if session was restored
- * if (transport.isRestored()) {
- *   // Handle restored session logic
- * }
+ * const initResult = transport.markAsInitialized();
+ * transport.setSessionId(originalSessionId);
+ * // Now transport.isRestored() returns true
  * ```
  */
 export class RestorableStreamableHTTPServerTransport extends StreamableHTTPServerTransport {
     _isRestored = false;
+    _restoredSessionId;
+    /**
+     * Sets the sessionId for a restored session.
+     *
+     * When restoring a session, we need to ensure the sessionId is available immediately
+     * without waiting for the sessionIdGenerator to be called by the SDK. This method
+     * directly sets the sessionId on the underlying transport.
+     *
+     * @param sessionId - The sessionId to set for the restored session
+     * @returns OperationResult indicating success or failure with error details
+     */
+    setSessionId(sessionId) {
+        this._restoredSessionId = sessionId;
+        try {
+            // Access the underlying _webStandardTransport where sessionId is stored
+            // StreamableHTTPServerTransport is a wrapper with getter-only sessionId
+            // The actual sessionId is on _webStandardTransport which allows setting
+            const internalTransport = this;
+            const webStandardTransport = internalTransport._webStandardTransport;
+            if (webStandardTransport) {
+                webStandardTransport.sessionId = sessionId;
+                return { success: true };
+            }
+            return {
+                success: false,
+                error: 'No webStandardTransport found - SDK internal structure may have changed or transport is not properly initialized',
+            };
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.warn(`Failed to set sessionId "${sessionId}" on underlying transport: ${errorMessage}`);
+            return { success: false, error: errorMessage };
+        }
+    }
+    /**
+     * Override sessionId getter to return restored sessionId if available.
+     *
+     * This ensures that even if the underlying transport hasn't generated the sessionId yet,
+     * we return the correct restored sessionId. If no restored session ID exists, delegates
+     * to the parent class's getter by manually accessing the property descriptor.
+     *
+     * @remarks
+     * We cannot use `super.sessionId` directly because this override shadows the parent's
+     * getter. Instead, we use Object.getOwnPropertyDescriptor to access the parent's
+     * property descriptor and call its getter with the correct context.
+     *
+     * Type assertion to `object` is safe here because we know the prototype chain exists:
+     * this -> RestorableStreamableHTTPServerTransport -> StreamableHTTPServerTransport -> Object.prototype
+     * Object.getOwnPropertyDescriptor requires an object type, and TypeScript cannot infer this
+     * from the double getPrototypeOf call.
+     */
+    get sessionId() {
+        // First check if we have a restored sessionId
+        if (this._restoredSessionId) {
+            return this._restoredSessionId;
+        }
+        // Otherwise delegate to parent class's getter directly
+        // Use Object.getOwnPropertyDescriptor to get the parent's property descriptor
+        // and call the getter with the parent's context
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const proto = Object.getPrototypeOf(Object.getPrototypeOf(this));
+        if (!proto)
+            return undefined;
+        const descriptor = Object.getOwnPropertyDescriptor(proto, 'sessionId');
+        if (descriptor?.get) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return descriptor.get.call(this);
+        }
+        return undefined;
+    }
     /**
      * Marks the transport as initialized for restored sessions.
      *
@@ -31,27 +104,29 @@ export class RestorableStreamableHTTPServerTransport extends StreamableHTTPServe
      * The MCP SDK checks the _initialized flag and rejects requests if it's false.
      * This method safely sets that flag to allow the restored session to work.
      *
-     * @throws Will log a warning if initialization fails but won't throw an error
+     * @returns OperationResult indicating success or failure with error details
      */
     markAsInitialized() {
         try {
             // Use type-safe interface to access internal SDK properties
-            // Reason: MCP SDK private property _initialized is not exposed in public types
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
+            // MCP SDK private property _initialized is not exposed in public types
             const internalTransport = this;
-            // Reason: Accessing private SDK property for session restoration functionality
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            // Accessing private SDK property for session restoration functionality
             if (internalTransport._initialized !== undefined) {
-                // Reason: Setting private SDK property to mark session as initialized for restoration
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                // Setting private SDK property to mark session as initialized for restoration
                 internalTransport._initialized = true;
             }
+            // Note: If _initialized is undefined, we still mark as restored since the SDK may have changed
+            // This provides graceful degradation while allowing session restoration to proceed
             this._isRestored = true;
             logger.debug('Transport marked as initialized for restored session');
+            return { success: true };
         }
         catch (error) {
-            logger.warn('Could not mark transport as initialized:', error);
-            // Don't throw - let the session attempt to work without the flag
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.warn(`Failed to mark transport as initialized: ${errorMessage}`);
+            this._isRestored = false;
+            return { success: false, error: errorMessage };
         }
     }
     /**
@@ -69,13 +144,10 @@ export class RestorableStreamableHTTPServerTransport extends StreamableHTTPServe
      */
     getRestorationInfo() {
         // Use type-safe interface to access potentially private sessionId
-        // Reason: sessionId property may not be exposed in public SDK types
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
         const internalTransport = this;
         return {
             isRestored: this._isRestored,
-            // Reason: Accessing potentially private sessionId property for debugging
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
+            // Accessing potentially private sessionId property for debugging
             sessionId: internalTransport.sessionId,
         };
     }

package/build/transport/http/restorableStreamableTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"restorableStreamableTransport.js","sourceRoot":"","sources":["../../../src/transport/http/restorableStreamableTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAU3C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,OAAO,uCAAwC,SAAQ,6BAA6B;IAChF,WAAW,GAAG,KAAK,CAAC;IAE5B;;;;;;;;;OASG;IACH,iBAAiB;QACf,IAAI,CAAC;YACH,4DAA4D;YAC5D,+EAA+E;YAC/E,uGAAuG;YACvG,MAAM,iBAAiB,GAAG,IAAW,CAAC;YAEtC,+EAA+E;YAC/E,sEAAsE;YACtE,IAAI,iBAAiB,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gBACjD,sFAAsF;gBACtF,sEAAsE;gBACtE,iBAAiB,CAAC,YAAY,GAAG,IAAI,CAAC;YACxC,CAAC;YAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,KAAK,CAAC,CAAC;YAC/D,iEAAiE;QACnE,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,kBAAkB;QAChB,kEAAkE;QAClE,oEAAoE;QACpE,uGAAuG;QACvG,MAAM,iBAAiB,GAAG,IAAW,CAAC;QAEtC,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,yEAAyE;YACzE,+GAA+G;YAC/G,SAAS,EAAE,iBAAiB,CAAC,SAAS;SACvC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"restorableStreamableTransport.js","sourceRoot":"","sources":["../../../src/transport/http/restorableStreamableTransport.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 import { AsyncLoadingOrchestrator } from '../../../core/capabilities/asyncLoadingOrchestrator.js';
 import { ServerManager } from '../../../core/server/serverManager.js';
 import { StreamableSessionRepository } from '../../../transport/http/storage/streamableSessionRepository.js';
+import { SessionService } from '../../../transport/http/utils/sessionService.js';
 import { RequestHandler, Router } from 'express';
-export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager, sessionRepository: StreamableSessionRepository, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string): void;
+export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager, sessionRepository: StreamableSessionRepository, authMiddleware: RequestHandler, availabilityMiddleware?: RequestHandler, asyncOrchestrator?: AsyncLoadingOrchestrator, customTemplate?: string, injectedSessionService?: SessionService): void;
 //# sourceMappingURL=streamableHttpRoutes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AAIzG,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AA0HpE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,2BAA2B,EAC9C,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CA8QN"}
+{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAWlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4DAA4D,CAAC;AAEzG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE7E,OAAO,EAAW,cAAc,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AAsDpE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,2BAA2B,EAC9C,cAAc,EAAE,cAAc,EAC9B,sBAAsB,CAAC,EAAE,cAAc,EACvC,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,CAAC,EAAE,MAAM,EACvB,sBAAsB,CAAC,EAAE,cAAc,GACtC,IAAI,CAqJN"}