@finatic/client 0.9.1 → 0.9.3

package/dist/index.mjs

@@ -1,6 +1,4 @@
 import pRetry, { AbortError } from 'p-retry';
-import pino from 'pino';
-import NodeCache from 'node-cache';
 import * as z from 'zod';
 import globalAxios from 'axios';
 
@@ -72,14 +70,12 @@ async function retryApiCall(fn, options = {}, config) {
 }
 
 /**
- * Structured logger utility with browser-safe fallback (Phase 2C).
+ * Structured logger utility with browser-safe console logging (Phase 2C).
  *
  * Generated - do not edit directly.
  *
- * This logger automatically falls back to console-based logging when pino fails
- * in browser environments (Vite, Next.js, etc.).
+ * This logger uses browser console APIs for all logging in browser environments.
  */
-// @ts-ignore - pino types available via @types/pino
 let _loggerInstance = null;
 /**
  * Get environment variable from various sources (browser and Node.js).
@@ -124,30 +120,6 @@ function isProduction() {
         return true;
     return false;
 }
-/**
- * Detect if we're in a browser environment.
- */
-function isBrowser() {
-    // Check for window object (browser)
-    if (typeof window !== 'undefined') {
-        return true;
-    }
-    // Check for globalThis in browser-like environments
-    if (typeof globalThis !== 'undefined') {
-        // In browsers, process might be polyfilled but process.stdout won't exist
-        try {
-            const proc = globalThis.process;
-            if (proc && typeof proc.stdout === 'undefined') {
-                return true;
-            }
-        }
-        catch {
-            // If we can't check, assume browser if window exists
-            return typeof window !== 'undefined';
-        }
-    }
-    return false;
-}
 /**
  * Get or create a logger instance with browser-safe fallback.
  */
@@ -155,36 +127,13 @@ function getLogger(config) {
     if (_loggerInstance) {
         return _loggerInstance;
     }
-    // In browser environments, skip pino entirely and use browser-safe logger
-    if (isBrowser()) {
-        return getBrowserSafeLogger(config);
-    }
-    // Try to use pino first (Node.js environments)
-    try {
-        const logLevel = (config?.logLevel || getEnvVar('FINATIC_LOG_LEVEL') || 'error');
-        const pinoConfig = {
-            level: logLevel === 'silent' ? 'silent' : logLevel,
-            ...(config?.structuredLogging !== false && {
-                formatters: {
-                    level: (label) => {
-                        return { level: label };
-                    },
-                },
-                timestamp: true,
-            }),
-        };
-        _loggerInstance = pino(pinoConfig);
-        return _loggerInstance;
-    }
-    catch (error) {
-        // Fallback to browser-safe logger if pino fails
-        return getBrowserSafeLogger(config, error);
-    }
+    // Client SDK always uses browser-safe logger (no pino)
+    return getBrowserSafeLogger(config);
 }
 /**
- * Browser-safe logger fallback for environments where pino fails.
+ * Browser-safe logger for Client SDK.
  */
-function getBrowserSafeLogger(config, pinoError) {
+function getBrowserSafeLogger(config) {
     // Log level hierarchy (matching pino's numeric levels)
     const LOG_LEVELS = {
         silent: 0,
@@ -215,7 +164,7 @@ function getBrowserSafeLogger(config, pinoError) {
     };
     const logLevel = getEffectiveLogLevel();
     const structuredLogging = config?.structuredLogging ?? false;
-    const isProd = isProduction();
+    isProduction();
     /**
      * Check if we should log at this level.
      */
@@ -348,10 +297,6 @@ function getBrowserSafeLogger(config, pinoError) {
             }
         },
     };
-    // Only warn about fallback logger if pino failed (not if we're in browser)
-    if (pinoError && !isProd) {
-        console.warn('[Finatic SDK] Using fallback logger due to pino initialization error:', pinoError);
-    }
     _loggerInstance = fallbackLogger;
     return _loggerInstance;
 }
@@ -419,11 +364,96 @@ function handleError(error, requestId) {
 }
 
 /**
- * Response caching utility with node-cache (Phase 2B).
+ * Response caching utility with browser-compatible Map-based cache (Phase 2B).
  *
  * Generated - do not edit directly.
  */
-// @ts-ignore - node-cache types available via @types/node-cache
+class MapBasedCache {
+    constructor(maxSize = 1000, defaultTtl = 300) {
+        this.cleanupInterval = null;
+        this.cache = new Map();
+        this.maxSize = maxSize;
+        this.defaultTtl = defaultTtl;
+        this.startCleanup();
+    }
+    startCleanup() {
+        // Clean up expired entries every minute
+        if (typeof window !== 'undefined') {
+            this.cleanupInterval = window.setInterval(() => {
+                this.cleanup();
+            }, 60000);
+        }
+    }
+    cleanup() {
+        const now = Date.now();
+        const keysToDelete = [];
+        for (const [key, entry] of this.cache.entries()) {
+            if (entry.expires < now) {
+                keysToDelete.push(key);
+            }
+        }
+        keysToDelete.forEach(key => this.cache.delete(key));
+    }
+    evictLRU() {
+        if (this.cache.size < this.maxSize) {
+            return;
+        }
+        // Simple LRU: remove oldest entry (first in Map)
+        const firstKey = this.cache.keys().next().value;
+        if (firstKey) {
+            this.cache.delete(firstKey);
+        }
+    }
+    get(key) {
+        const entry = this.cache.get(key);
+        if (!entry) {
+            return undefined;
+        }
+        // Check if expired
+        if (entry.expires < Date.now()) {
+            this.cache.delete(key);
+            return undefined;
+        }
+        return entry.value;
+    }
+    set(key, value, ttl) {
+        // Evict if at max size
+        if (this.cache.size >= this.maxSize && !this.cache.has(key)) {
+            this.evictLRU();
+        }
+        const expires = Date.now() + (ttl || this.defaultTtl) * 1000;
+        this.cache.set(key, { value, expires });
+        return true;
+    }
+    del(key) {
+        return this.cache.delete(key) ? 1 : 0;
+    }
+    clear() {
+        this.cache.clear();
+    }
+    keys() {
+        return Array.from(this.cache.keys());
+    }
+    has(key) {
+        const entry = this.cache.get(key);
+        if (!entry) {
+            return false;
+        }
+        // Check if expired
+        if (entry.expires < Date.now()) {
+            this.cache.delete(key);
+            return false;
+        }
+        return true;
+    }
+    destroy() {
+        if (this.cleanupInterval !== null && typeof window !== 'undefined') {
+            window.clearInterval(this.cleanupInterval);
+            this.cleanupInterval = null;
+        }
+        this.cache.clear();
+    }
+}
 let _cacheInstance = null;
 /**
  * Get or create cache instance.
@@ -435,11 +465,7 @@ function getCache(config) {
     if (_cacheInstance) {
         return _cacheInstance;
     }
-    _cacheInstance = new NodeCache({
-        stdTTL: config.cacheTtl || 300,
-        maxKeys: config.cacheMaxSize || 1000,
-        useClones: false,
-    });
+    _cacheInstance = new MapBasedCache(config.cacheMaxSize || 1000, config.cacheTtl || 300);
     return _cacheInstance;
 }
 /**
@@ -1183,6 +1209,256 @@ var SessionStatus;
     SessionStatus["Expired"] = "expired";
 })(SessionStatus || (SessionStatus = {}));
 
+/**
+ * Pagination utilities for TypeScript SDK.
+ *
+ * Provides PaginatedData class for wrapping paginated responses with helper methods.
+ */
+/**
+ * PaginatedData wraps a data array with pagination metadata and helper methods.
+ *
+ * This class behaves like an array, so you can use it directly:
+ * - paginatedData.length returns the number of items
+ * - paginatedData[0] returns the first item
+ * - paginatedData.forEach(...) works directly
+ * - paginatedData.map(...) works directly
+ *
+ * It also provides pagination methods:
+ * - hasMore: Check if there are more pages
+ * - nextPage(): Get the next page
+ * - prevPage(): Get the previous page
+ * - firstPage(): Get the first page
+ * - lastPage(): Get the last page
+ *
+ * @template T - The element type (e.g., FDXBrokerAccount)
+ *
+ * Usage:
+ * ```typescript
+ * const response = await sdk.getAccounts();
+ * const accounts = response.success.data;  // Can use directly as array!
+ * console.log(accounts.length);  // Works directly
+ * console.log(accounts[0]);  // Works directly
+ * accounts.forEach(account => console.log(account));  // Works directly
+ *
+ * if (accounts.hasMore) {
+ *   const nextPage = await accounts.nextPage();  // Returns PaginatedData<FDXBrokerAccount>
+ *   const nextAccounts = nextPage;  // Can use directly as array too!
+ * }
+ * ```
+ */
+class PaginatedData {
+    constructor(items, // The actual data array
+    meta, 
+    // Use any for method type since it's only called for paginated endpoints
+    // and will return PaginatedData<T> at runtime
+    originalMethod, currentParams, wrapperInstance // Reference to wrapper for method calls
+    ) {
+        this.items = items;
+        this.meta = meta;
+        this.originalMethod = originalMethod;
+        this.currentParams = currentParams;
+        this.wrapperInstance = wrapperInstance;
+        // Create a Proxy to allow array-like indexing (paginatedData[0])
+        return new Proxy(this, {
+            get(target, prop) {
+                // Handle numeric indices
+                if (typeof prop === 'string' && /^\d+$/.test(prop)) {
+                    return target.items[Number(prop)];
+                }
+                // Handle length property
+                if (prop === 'length') {
+                    return target.items.length;
+                }
+                // Handle array methods and other properties
+                return target[prop];
+            },
+            has(target, prop) {
+                // Support 'in' operator
+                if (typeof prop === 'string' && /^\d+$/.test(prop)) {
+                    return Number(prop) < target.items.length;
+                }
+                return prop in target;
+            },
+            ownKeys(target) {
+                // Include numeric indices for Object.keys()
+                const keys = Object.keys(target);
+                for (let i = 0; i < target.items.length; i++) {
+                    keys.push(String(i));
+                }
+                return keys;
+            },
+            getOwnPropertyDescriptor(target, prop) {
+                if (typeof prop === 'string' && /^\d+$/.test(prop)) {
+                    const index = Number(prop);
+                    if (index < target.items.length) {
+                        return {
+                            enumerable: true,
+                            configurable: true,
+                            value: target.items[index],
+                        };
+                    }
+                }
+                return Object.getOwnPropertyDescriptor(target, prop);
+            },
+        });
+    }
+    /**
+     * Get the number of items (allows paginatedData.length).
+     */
+    get length() {
+        return this.items.length;
+    }
+    /**
+     * Check if there are more pages available.
+     */
+    get hasMore() {
+        return this.meta.has_more;
+    }
+    // Array-like methods - delegate to items array
+    /**
+     * Calls a function for each element in the array.
+     */
+    forEach(callbackfn, thisArg) {
+        return this.items.forEach(callbackfn, thisArg);
+    }
+    /**
+     * Creates a new array with the results of calling a function for every array element.
+     */
+    map(callbackfn, thisArg) {
+        return this.items.map(callbackfn, thisArg);
+    }
+    /**
+     * Returns the elements of an array that meet the condition specified in a callback function.
+     */
+    filter(callbackfn, thisArg) {
+        return this.items.filter(callbackfn, thisArg);
+    }
+    /**
+     * Returns the value of the first element in the array where predicate is true.
+     */
+    find(predicate, thisArg) {
+        return this.items.find(predicate, thisArg);
+    }
+    /**
+     * Returns the index of the first element in the array where predicate is true.
+     */
+    findIndex(predicate, thisArg) {
+        return this.items.findIndex(predicate, thisArg);
+    }
+    /**
+     * Returns a section of an array.
+     */
+    slice(start, end) {
+        return this.items.slice(start, end);
+    }
+    /**
+     * Determines whether an array includes a certain element.
+     */
+    includes(searchElement, fromIndex) {
+        return this.items.includes(searchElement, fromIndex);
+    }
+    /**
+     * Returns the index of the first occurrence of a value in an array.
+     */
+    indexOf(searchElement, fromIndex) {
+        return this.items.indexOf(searchElement, fromIndex);
+    }
+    /**
+     * Returns a string representation of an array.
+     */
+    toString() {
+        return this.items.toString();
+    }
+    /**
+     * Returns a string representation of an array.
+     */
+    toLocaleString() {
+        return this.items.toLocaleString();
+    }
+    /**
+     * Get the next page of data.
+     * @returns Promise<PaginatedData<T>> - The next page (not wrapped in FinaticResponse)
+     * @throws Error if no more pages are available
+     */
+    async nextPage() {
+        if (!this.hasMore) {
+            throw new Error('No more pages available');
+        }
+        if (this.meta.next_offset === null) {
+            throw new Error('Next offset is null');
+        }
+        const newParams = {
+            ...this.currentParams,
+            offset: this.meta.next_offset,
+        };
+        const response = await this.originalMethod.call(this.wrapperInstance, newParams);
+        if (!response.success) {
+            throw new Error(response.error?.message || 'Failed to fetch next page');
+        }
+        return response.success.data; // Return PaginatedData directly
+    }
+    /**
+     * Get the previous page of data.
+     * @returns Promise<PaginatedData<T>> - The previous page (not wrapped in FinaticResponse)
+     * @throws Error if fetch fails
+     */
+    async prevPage() {
+        const prevOffset = Math.max(0, this.meta.current_offset - this.meta.limit);
+        const newParams = {
+            ...this.currentParams,
+            offset: prevOffset,
+        };
+        const response = await this.originalMethod.call(this.wrapperInstance, newParams);
+        if (!response.success) {
+            throw new Error(response.error?.message || 'Failed to fetch previous page');
+        }
+        return response.success.data; // Return PaginatedData directly
+    }
+    /**
+     * Get the first page of data.
+     * @returns Promise<PaginatedData<T>> - The first page (not wrapped in FinaticResponse)
+     * @throws Error if fetch fails
+     */
+    async firstPage() {
+        const newParams = {
+            ...this.currentParams,
+            offset: 0,
+        };
+        const response = await this.originalMethod.call(this.wrapperInstance, newParams);
+        if (!response.success) {
+            throw new Error(response.error?.message || 'Failed to fetch first page');
+        }
+        return response.success.data; // Return PaginatedData directly
+    }
+    /**
+     * Get the last page of data.
+     * Uses iterative approach to find the last page.
+     * @returns Promise<PaginatedData<T>> - The last page (not wrapped in FinaticResponse)
+     * @throws Error if fetch fails
+     */
+    async lastPage() {
+        // Iterative approach to find last page
+        let currentOffset = this.meta.current_offset;
+        let lastValidData = null;
+        while (true) {
+            const testParams = { ...this.currentParams, offset: currentOffset };
+            const response = await this.originalMethod.call(this.wrapperInstance, testParams);
+            if (!response.success) {
+                break;
+            }
+            lastValidData = response.success.data;
+            if (!lastValidData || !lastValidData.hasMore) {
+                break;
+            }
+            currentOffset += this.meta.limit;
+        }
+        if (!lastValidData) {
+            throw new Error('Failed to fetch last page');
+        }
+        return lastValidData; // Return PaginatedData directly
+    }
+}
+
 /**
  * Generated wrapper functions for brokers operations (Phase 2A).
  *
@@ -1232,7 +1508,7 @@ class BrokersWrapper {
      * -------
      * FinaticResponse[list[BrokerInfo]]
      *     list of available brokers with their metadata.
-     * @param No parameters required for this method
+     * @param params No parameters required for this method
      * @returns {Promise<FinaticResponse<BrokerInfo[]>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/
@@ -1241,7 +1517,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getBrokers();
+     * const result = await finatic.getBrokers({});
      *
      * // Access the response data
      * if (result.success) {
@@ -1249,9 +1525,9 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getBrokers() {
+    async getBrokers(params) {
         // No parameters - use empty params object
-        const params = {}; // Generate request ID
+        const resolvedParams = params || {}; // Generate request ID
         const requestId = this._generateRequestId();
         // Input validation (Phase 2B: zod)
         if (this.sdkConfig?.validationEnabled) ;
@@ -1259,7 +1535,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -1271,7 +1547,7 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/',
-            params: params,
+            params: resolvedParams,
             action: 'getBrokers'
         });
         try {
@@ -1285,9 +1561,15 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Brokers completed', {
@@ -1295,6 +1577,7 @@ class BrokersWrapper {
                 action: 'getBrokers'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -1372,7 +1655,7 @@ class BrokersWrapper {
      * This endpoint is accessible from the portal and uses session-only authentication.
      * Returns connections that the user has any permissions for, including the current
      * company's permissions (read/write) for each connection.
-     * @param No parameters required for this method
+     * @param params No parameters required for this method
      * @returns {Promise<FinaticResponse<UserBrokerConnectionWithPermissions[]>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/connections
@@ -1381,7 +1664,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getBrokerConnections();
+     * const result = await finatic.getBrokerConnections({});
      *
      * // Access the response data
      * if (result.success) {
@@ -1389,10 +1672,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getBrokerConnections() {
+    async getBrokerConnections(params) {
         // No parameters - use empty params object
-        const params = {}; // Authentication check
-        if (!this.sessionId) {
+        const resolvedParams = params || {}; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1403,7 +1686,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/connections', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/connections', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -1415,12 +1698,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/connections',
-            params: params,
+            params: resolvedParams,
             action: 'getBrokerConnections'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.listBrokerConnectionsApiV1BrokersConnectionsGet({ headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.listBrokerConnectionsApiV1BrokersConnectionsGet({ headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -1429,9 +1712,15 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/connections', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/connections', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('List Broker Connections completed', {
@@ -1439,6 +1728,7 @@ class BrokersWrapper {
                 action: 'getBrokerConnections'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -1515,7 +1805,7 @@ class BrokersWrapper {
      *
      * If the company is the only one with access, the entire connection is deleted.
      * If other companies have access, only the company's access is removed.
-     * @param connectionId {string}
+     * @param params.connectionId {string} Connection ID
      * @returns {Promise<FinaticResponse<DisconnectActionResult>>} Standard response with success/Error/Warning structure
      *
      * Generated from: DELETE /api/v1/brokers/disconnect-company/{connection_id}
@@ -1524,7 +1814,9 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.disconnectCompanyFromBroker(connectionId: '00000000-0000-0000-0000-000000000000');
+     * const result = await finatic.disconnectCompanyFromBroker({
+      connectionId: '00000000-0000-0000-0000-000000000000'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -1534,12 +1826,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async disconnectCompanyFromBroker(connectionId) {
-        // Construct params object from individual parameters
-        const params = {
-            connectionId: connectionId
-        }; // Authentication check
-        if (!this.sessionId) {
+    async disconnectCompanyFromBroker(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1550,7 +1840,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('DELETE', '/api/v1/brokers/disconnect-company/{connection_id}', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('DELETE', '/api/v1/brokers/disconnect-company/{connection_id}', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -1562,12 +1852,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'DELETE',
             path: '/api/v1/brokers/disconnect-company/{connection_id}',
-            params: params,
+            params: resolvedParams,
             action: 'disconnectCompanyFromBroker'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.disconnectCompanyFromBrokerApiV1BrokersDisconnectCompanyConnectionIdDelete({ connectionId: connectionId }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.disconnectCompanyFromBrokerApiV1BrokersDisconnectCompanyConnectionIdDelete({ connectionId: resolvedParams.connectionId }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -1576,9 +1866,15 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('DELETE', '/api/v1/brokers/disconnect-company/{connection_id}', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('DELETE', '/api/v1/brokers/disconnect-company/{connection_id}', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Disconnect Company From Broker completed', {
@@ -1586,6 +1882,7 @@ class BrokersWrapper {
                 action: 'disconnectCompanyFromBroker'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -1662,19 +1959,19 @@ class BrokersWrapper {
      *
      * This endpoint is accessible from the portal and uses session-only authentication.
      * Returns orders from connections the company has read access to.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param accountId {string} (optional)
-     * @param symbol {string} (optional)
-     * @param orderStatus {BrokerDataOrderStatusEnum} (optional)
-     * @param side {BrokerDataOrderSideEnum} (optional)
-     * @param assetType {BrokerDataAssetTypeEnum} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param createdAfter {string} (optional)
-     * @param createdBefore {string} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerOrder[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.accountId {string} (optional) Filter by broker provided account ID
+     * @param params.symbol {string} (optional) Filter by symbol
+     * @param params.orderStatus {BrokerDataOrderStatusEnum} (optional) Filter by order status (e.g., 'filled', 'pending_new', 'cancelled')
+     * @param params.side {BrokerDataOrderSideEnum} (optional) Filter by order side (e.g., 'buy', 'sell')
+     * @param params.assetType {BrokerDataAssetTypeEnum} (optional) Filter by asset type (e.g., 'stock', 'option', 'crypto', 'future')
+     * @param params.limit {number} (optional) Maximum number of orders to return
+     * @param params.offset {number} (optional) Number of orders to skip for pagination
+     * @param params.createdAfter {string} (optional) Filter orders created after this timestamp
+     * @param params.createdBefore {string} (optional) Filter orders created before this timestamp
+     * @param params.includeMetadata {boolean} (optional) Include order metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerOrder>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/orders
      * @methodId get_orders_api_v1_brokers_data_orders_get
@@ -1682,7 +1979,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getOrders();
+     * const result = await finatic.getOrders({});
      *
      * // Access the response data
      * if (result.success) {
@@ -1692,7 +1989,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getOrders(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', accountId: '123456789');
+     * const result = await finatic.getOrders({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      accountId: '123456789'
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -1705,23 +2006,19 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getOrders(brokerId, connectionId, accountId, symbol, orderStatus, side, assetType, limit, offset, createdAfter, createdBefore, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            accountId: accountId,
-            symbol: symbol,
-            orderStatus: orderStatus !== undefined ? coerceEnumValue(orderStatus, BrokerDataOrderStatusEnum, 'orderStatus') : undefined,
-            side: side !== undefined ? coerceEnumValue(side, BrokerDataOrderSideEnum, 'side') : undefined,
-            assetType: assetType !== undefined ? coerceEnumValue(assetType, BrokerDataAssetTypeEnum, 'assetType') : undefined,
-            limit: limit,
-            offset: offset,
-            createdAfter: createdAfter,
-            createdBefore: createdBefore,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getOrders(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {};
+        if (params?.orderStatus !== undefined) {
+            params.orderStatus = coerceEnumValue(params.orderStatus, BrokerDataOrderStatusEnum, 'orderStatus');
+        }
+        if (params?.side !== undefined) {
+            params.side = coerceEnumValue(params.side, BrokerDataOrderSideEnum, 'side');
+        }
+        if (params?.assetType !== undefined) {
+            params.assetType = coerceEnumValue(params.assetType, BrokerDataAssetTypeEnum, 'assetType');
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1732,7 +2029,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -1744,12 +2041,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/orders',
-            params: params,
+            params: resolvedParams,
             action: 'getOrders'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getOrdersApiV1BrokersDataOrdersGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(accountId !== undefined ? { accountId: accountId } : {}), ...(symbol !== undefined ? { symbol: symbol } : {}), ...(orderStatus !== undefined ? { orderStatus: orderStatus } : {}), ...(side !== undefined ? { side: side } : {}), ...(assetType !== undefined ? { assetType: assetType } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(createdAfter !== undefined ? { createdAfter: createdAfter } : {}), ...(createdBefore !== undefined ? { createdBefore: createdBefore } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getOrdersApiV1BrokersDataOrdersGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, accountId: resolvedParams.accountId, symbol: resolvedParams.symbol, orderStatus: resolvedParams.orderStatus, side: resolvedParams.side, assetType: resolvedParams.assetType, limit: resolvedParams.limit, offset: resolvedParams.offset, createdAfter: resolvedParams.createdAfter, createdBefore: resolvedParams.createdBefore, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -1758,9 +2055,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getOrders.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Orders completed', {
@@ -1768,6 +2083,7 @@ class BrokersWrapper {
                 action: 'getOrders'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -1844,19 +2160,19 @@ class BrokersWrapper {
      *
      * This endpoint is accessible from the portal and uses session-only authentication.
      * Returns positions from connections the company has read access to.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param accountId {string} (optional)
-     * @param symbol {string} (optional)
-     * @param side {BrokerDataOrderSideEnum} (optional)
-     * @param assetType {BrokerDataAssetTypeEnum} (optional)
-     * @param positionStatus {BrokerDataPositionStatusEnum} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param updatedAfter {string} (optional)
-     * @param updatedBefore {string} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerPosition[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.accountId {string} (optional) Filter by broker provided account ID
+     * @param params.symbol {string} (optional) Filter by symbol
+     * @param params.side {BrokerDataOrderSideEnum} (optional) Filter by position side (e.g., 'long', 'short')
+     * @param params.assetType {BrokerDataAssetTypeEnum} (optional) Filter by asset type (e.g., 'stock', 'option', 'crypto', 'future')
+     * @param params.positionStatus {BrokerDataPositionStatusEnum} (optional) Filter by position status: 'open' (quantity > 0) or 'closed' (quantity = 0)
+     * @param params.limit {number} (optional) Maximum number of positions to return
+     * @param params.offset {number} (optional) Number of positions to skip for pagination
+     * @param params.updatedAfter {string} (optional) Filter positions updated after this timestamp
+     * @param params.updatedBefore {string} (optional) Filter positions updated before this timestamp
+     * @param params.includeMetadata {boolean} (optional) Include position metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerPosition>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/positions
      * @methodId get_positions_api_v1_brokers_data_positions_get
@@ -1864,7 +2180,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getPositions();
+     * const result = await finatic.getPositions({});
      *
      * // Access the response data
      * if (result.success) {
@@ -1874,7 +2190,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getPositions(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', accountId: '123456789');
+     * const result = await finatic.getPositions({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      accountId: '123456789'
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -1887,23 +2207,19 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getPositions(brokerId, connectionId, accountId, symbol, side, assetType, positionStatus, limit, offset, updatedAfter, updatedBefore, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            accountId: accountId,
-            symbol: symbol,
-            side: side !== undefined ? coerceEnumValue(side, BrokerDataOrderSideEnum, 'side') : undefined,
-            assetType: assetType !== undefined ? coerceEnumValue(assetType, BrokerDataAssetTypeEnum, 'assetType') : undefined,
-            positionStatus: positionStatus !== undefined ? coerceEnumValue(positionStatus, BrokerDataPositionStatusEnum, 'positionStatus') : undefined,
-            limit: limit,
-            offset: offset,
-            updatedAfter: updatedAfter,
-            updatedBefore: updatedBefore,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getPositions(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {};
+        if (params?.side !== undefined) {
+            params.side = coerceEnumValue(params.side, BrokerDataOrderSideEnum, 'side');
+        }
+        if (params?.assetType !== undefined) {
+            params.assetType = coerceEnumValue(params.assetType, BrokerDataAssetTypeEnum, 'assetType');
+        }
+        if (params?.positionStatus !== undefined) {
+            params.positionStatus = coerceEnumValue(params.positionStatus, BrokerDataPositionStatusEnum, 'positionStatus');
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1914,7 +2230,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -1926,12 +2242,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/positions',
-            params: params,
+            params: resolvedParams,
             action: 'getPositions'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getPositionsApiV1BrokersDataPositionsGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(accountId !== undefined ? { accountId: accountId } : {}), ...(symbol !== undefined ? { symbol: symbol } : {}), ...(side !== undefined ? { side: side } : {}), ...(assetType !== undefined ? { assetType: assetType } : {}), ...(positionStatus !== undefined ? { positionStatus: positionStatus } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(updatedAfter !== undefined ? { updatedAfter: updatedAfter } : {}), ...(updatedBefore !== undefined ? { updatedBefore: updatedBefore } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getPositionsApiV1BrokersDataPositionsGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, accountId: resolvedParams.accountId, symbol: resolvedParams.symbol, side: resolvedParams.side, assetType: resolvedParams.assetType, positionStatus: resolvedParams.positionStatus, limit: resolvedParams.limit, offset: resolvedParams.offset, updatedAfter: resolvedParams.updatedAfter, updatedBefore: resolvedParams.updatedBefore, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -1940,9 +2256,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getPositions.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Positions completed', {
@@ -1950,6 +2284,7 @@ class BrokersWrapper {
                 action: 'getPositions'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2026,16 +2361,16 @@ class BrokersWrapper {
      *
      * This endpoint is accessible from the portal and uses session-only authentication.
      * Returns balances from connections the company has read access to.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param accountId {string} (optional)
-     * @param isEndOfDaySnapshot {boolean} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param balanceCreatedAfter {string} (optional)
-     * @param balanceCreatedBefore {string} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerBalance[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.accountId {string} (optional) Filter by broker provided account ID
+     * @param params.isEndOfDaySnapshot {boolean} (optional) Filter by end-of-day snapshot status (true/false)
+     * @param params.limit {number} (optional) Maximum number of balances to return
+     * @param params.offset {number} (optional) Number of balances to skip for pagination
+     * @param params.balanceCreatedAfter {string} (optional) Filter balances created after this timestamp
+     * @param params.balanceCreatedBefore {string} (optional) Filter balances created before this timestamp
+     * @param params.includeMetadata {boolean} (optional) Include balance metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerBalance>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/balances
      * @methodId get_balances_api_v1_brokers_data_balances_get
@@ -2043,7 +2378,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getBalances();
+     * const result = await finatic.getBalances({});
      *
      * // Access the response data
      * if (result.success) {
@@ -2053,7 +2388,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getBalances(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', accountId: '123456789');
+     * const result = await finatic.getBalances({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      accountId: '123456789'
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2066,20 +2405,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getBalances(brokerId, connectionId, accountId, isEndOfDaySnapshot, limit, offset, balanceCreatedAfter, balanceCreatedBefore, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            accountId: accountId,
-            isEndOfDaySnapshot: isEndOfDaySnapshot,
-            limit: limit,
-            offset: offset,
-            balanceCreatedAfter: balanceCreatedAfter,
-            balanceCreatedBefore: balanceCreatedBefore,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getBalances(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {}; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2090,7 +2419,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/balances', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/balances', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2102,12 +2431,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/balances',
-            params: params,
+            params: resolvedParams,
             action: 'getBalances'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getBalancesApiV1BrokersDataBalancesGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(accountId !== undefined ? { accountId: accountId } : {}), ...(isEndOfDaySnapshot !== undefined ? { isEndOfDaySnapshot: isEndOfDaySnapshot } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(balanceCreatedAfter !== undefined ? { balanceCreatedAfter: balanceCreatedAfter } : {}), ...(balanceCreatedBefore !== undefined ? { balanceCreatedBefore: balanceCreatedBefore } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getBalancesApiV1BrokersDataBalancesGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, accountId: resolvedParams.accountId, isEndOfDaySnapshot: resolvedParams.isEndOfDaySnapshot, limit: resolvedParams.limit, offset: resolvedParams.offset, balanceCreatedAfter: resolvedParams.balanceCreatedAfter, balanceCreatedBefore: resolvedParams.balanceCreatedBefore, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2116,9 +2445,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getBalances.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/balances', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/balances', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Balances completed', {
@@ -2126,6 +2473,7 @@ class BrokersWrapper {
                 action: 'getBalances'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2202,15 +2550,15 @@ class BrokersWrapper {
      *
      * This endpoint is accessible from the portal and uses session-only authentication.
      * Returns accounts from connections the company has read access to.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param accountType {BrokerDataAccountTypeEnum} (optional)
-     * @param status {AccountStatus} (optional)
-     * @param currency {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerAccount[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.accountType {BrokerDataAccountTypeEnum} (optional) Filter by account type (e.g., 'margin', 'cash', 'crypto_wallet', 'live', 'sim')
+     * @param params.status {AccountStatus} (optional) Filter by account status (e.g., 'active', 'inactive')
+     * @param params.currency {string} (optional) Filter by currency (e.g., 'USD', 'EUR')
+     * @param params.limit {number} (optional) Maximum number of accounts to return
+     * @param params.offset {number} (optional) Number of accounts to skip for pagination
+     * @param params.includeMetadata {boolean} (optional) Include connection metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerAccount>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/accounts
      * @methodId get_accounts_api_v1_brokers_data_accounts_get
@@ -2218,7 +2566,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getAccounts();
+     * const result = await finatic.getAccounts({});
      *
      * // Access the response data
      * if (result.success) {
@@ -2228,7 +2576,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getAccounts(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', accountType: 'margin');
+     * const result = await finatic.getAccounts({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      accountType: 'margin'
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2241,19 +2593,13 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getAccounts(brokerId, connectionId, accountType, status, currency, limit, offset, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            accountType: accountType !== undefined ? coerceEnumValue(accountType, BrokerDataAccountTypeEnum, 'accountType') : undefined,
-            status: status,
-            currency: currency,
-            limit: limit,
-            offset: offset,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getAccounts(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {};
+        if (params?.accountType !== undefined) {
+            params.accountType = coerceEnumValue(params.accountType, BrokerDataAccountTypeEnum, 'accountType');
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2264,7 +2610,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/accounts', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/accounts', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2276,12 +2622,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/accounts',
-            params: params,
+            params: resolvedParams,
             action: 'getAccounts'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getAccountsApiV1BrokersDataAccountsGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(accountType !== undefined ? { accountType: accountType } : {}), ...(status !== undefined ? { status: status } : {}), ...(currency !== undefined ? { currency: currency } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getAccountsApiV1BrokersDataAccountsGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, accountType: resolvedParams.accountType, status: resolvedParams.status, currency: resolvedParams.currency, limit: resolvedParams.limit, offset: resolvedParams.offset, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2290,9 +2636,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getAccounts.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/accounts', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/accounts', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Accounts completed', {
@@ -2300,6 +2664,7 @@ class BrokersWrapper {
                 action: 'getAccounts'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2375,12 +2740,12 @@ class BrokersWrapper {
      * Get order fills for a specific order.
      *
      * This endpoint returns all execution fills for the specified order.
-     * @param orderId {string}
-     * @param connectionId {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerOrderFill[]>>} Standard response with success/Error/Warning structure
+     * @param params.orderId {string} Order ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.limit {number} (optional) Maximum number of fills to return
+     * @param params.offset {number} (optional) Number of fills to skip for pagination
+     * @param params.includeMetadata {boolean} (optional) Include fill metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerOrderFill>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/orders/{order_id}/fills
      * @methodId get_order_fills_api_v1_brokers_data_orders__order_id__fills_get
@@ -2388,7 +2753,9 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.getOrderFills(orderId: '00000000-0000-0000-0000-000000000000');
+     * const result = await finatic.getOrderFills({
+      orderId: '00000000-0000-0000-0000-000000000000'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -2400,7 +2767,12 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getOrderFills(orderId: '00000000-0000-0000-0000-000000000000', connectionId: '00000000-0000-0000-0000-000000000000', limit: 100, offset: 0);
+     * const result = await finatic.getOrderFills({
+      orderId: '00000000-0000-0000-0000-000000000000',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      limit: 100,
+      offset: 0
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2413,16 +2785,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getOrderFills(orderId, connectionId, limit, offset, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            orderId: orderId,
-            connectionId: connectionId,
-            limit: limit,
-            offset: offset,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getOrderFills(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2433,7 +2799,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/fills', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/fills', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2445,12 +2811,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/orders/{order_id}/fills',
-            params: params,
+            params: resolvedParams,
             action: 'getOrderFills'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getOrderFillsApiV1BrokersDataOrdersOrderIdFillsGet({ orderId: orderId, ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getOrderFillsApiV1BrokersDataOrdersOrderIdFillsGet({ orderId: resolvedParams.orderId, connectionId: resolvedParams.connectionId, limit: resolvedParams.limit, offset: resolvedParams.offset, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2459,9 +2825,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getOrderFills.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/fills', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/fills', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Order Fills completed', {
@@ -2469,6 +2853,7 @@ class BrokersWrapper {
                 action: 'getOrderFills'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2544,12 +2929,12 @@ class BrokersWrapper {
      * Get order events for a specific order.
      *
      * This endpoint returns all lifecycle events for the specified order.
-     * @param orderId {string}
-     * @param connectionId {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerOrderEvent[]>>} Standard response with success/Error/Warning structure
+     * @param params.orderId {string} Order ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.limit {number} (optional) Maximum number of events to return
+     * @param params.offset {number} (optional) Number of events to skip for pagination
+     * @param params.includeMetadata {boolean} (optional) Include event metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerOrderEvent>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/orders/{order_id}/events
      * @methodId get_order_events_api_v1_brokers_data_orders__order_id__events_get
@@ -2557,7 +2942,9 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.getOrderEvents(orderId: '00000000-0000-0000-0000-000000000000');
+     * const result = await finatic.getOrderEvents({
+      orderId: '00000000-0000-0000-0000-000000000000'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -2569,7 +2956,12 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getOrderEvents(orderId: '00000000-0000-0000-0000-000000000000', connectionId: '00000000-0000-0000-0000-000000000000', limit: 100, offset: 0);
+     * const result = await finatic.getOrderEvents({
+      orderId: '00000000-0000-0000-0000-000000000000',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      limit: 100,
+      offset: 0
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2582,16 +2974,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getOrderEvents(orderId, connectionId, limit, offset, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            orderId: orderId,
-            connectionId: connectionId,
-            limit: limit,
-            offset: offset,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getOrderEvents(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2602,7 +2988,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/events', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/events', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2614,12 +3000,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/orders/{order_id}/events',
-            params: params,
+            params: resolvedParams,
             action: 'getOrderEvents'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getOrderEventsApiV1BrokersDataOrdersOrderIdEventsGet({ orderId: orderId, ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getOrderEventsApiV1BrokersDataOrdersOrderIdEventsGet({ orderId: resolvedParams.orderId, connectionId: resolvedParams.connectionId, limit: resolvedParams.limit, offset: resolvedParams.offset, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2628,9 +3014,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getOrderEvents.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/events', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/{order_id}/events', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Order Events completed', {
@@ -2638,6 +3042,7 @@ class BrokersWrapper {
                 action: 'getOrderEvents'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2713,14 +3118,14 @@ class BrokersWrapper {
      * Get order groups.
      *
      * This endpoint returns order groups that contain multiple orders.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @param createdAfter {string} (optional)
-     * @param createdBefore {string} (optional)
-     * @param includeMetadata {boolean} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerOrderGroup[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.limit {number} (optional) Maximum number of order groups to return
+     * @param params.offset {number} (optional) Number of order groups to skip for pagination
+     * @param params.createdAfter {string} (optional) Filter order groups created after this timestamp
+     * @param params.createdBefore {string} (optional) Filter order groups created before this timestamp
+     * @param params.includeMetadata {boolean} (optional) Include group metadata in response (excluded by default for FDX compliance)
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerOrderGroup>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/orders/groups
      * @methodId get_order_groups_api_v1_brokers_data_orders_groups_get
@@ -2728,7 +3133,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getOrderGroups();
+     * const result = await finatic.getOrderGroups({});
      *
      * // Access the response data
      * if (result.success) {
@@ -2738,7 +3143,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getOrderGroups(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', limit: 100);
+     * const result = await finatic.getOrderGroups({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      limit: 100
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2751,18 +3160,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getOrderGroups(brokerId, connectionId, limit, offset, createdAfter, createdBefore, includeMetadata) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            limit: limit,
-            offset: offset,
-            createdAfter: createdAfter,
-            createdBefore: createdBefore,
-            includeMetadata: includeMetadata
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getOrderGroups(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {}; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2773,7 +3174,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/groups', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/groups', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2785,12 +3186,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/orders/groups',
-            params: params,
+            params: resolvedParams,
             action: 'getOrderGroups'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getOrderGroupsApiV1BrokersDataOrdersGroupsGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}), ...(createdAfter !== undefined ? { createdAfter: createdAfter } : {}), ...(createdBefore !== undefined ? { createdBefore: createdBefore } : {}), ...(includeMetadata !== undefined ? { includeMetadata: includeMetadata } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getOrderGroupsApiV1BrokersDataOrdersGroupsGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, limit: resolvedParams.limit, offset: resolvedParams.offset, createdAfter: resolvedParams.createdAfter, createdBefore: resolvedParams.createdBefore, includeMetadata: resolvedParams.includeMetadata }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2799,9 +3200,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getOrderGroups.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/groups', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/orders/groups', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Order Groups completed', {
@@ -2809,6 +3228,7 @@ class BrokersWrapper {
                 action: 'getOrderGroups'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -2885,14 +3305,14 @@ class BrokersWrapper {
      *
      * This endpoint returns tax lots for positions, which are used for tax reporting.
      * Each lot tracks when a position was opened/closed and at what prices.
-     * @param brokerId {string} (optional)
-     * @param connectionId {string} (optional)
-     * @param accountId {string} (optional)
-     * @param symbol {string} (optional)
-     * @param positionId {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerPositionLot[]>>} Standard response with success/Error/Warning structure
+     * @param params.brokerId {string} (optional) Filter by broker ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.accountId {string} (optional) Filter by broker provided account ID
+     * @param params.symbol {string} (optional) Filter by symbol
+     * @param params.positionId {string} (optional) Filter by position ID
+     * @param params.limit {number} (optional) Maximum number of position lots to return
+     * @param params.offset {number} (optional) Number of position lots to skip for pagination
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerPositionLot>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/positions/lots
      * @methodId get_position_lots_api_v1_brokers_data_positions_lots_get
@@ -2900,7 +3320,7 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getPositionLots();
+     * const result = await finatic.getPositionLots({});
      *
      * // Access the response data
      * if (result.success) {
@@ -2910,7 +3330,11 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getPositionLots(brokerId: 'alpaca', connectionId: '00000000-0000-0000-0000-000000000000', accountId: '123456789');
+     * const result = await finatic.getPositionLots({
+      brokerId: 'alpaca',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      accountId: '123456789'
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -2923,18 +3347,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getPositionLots(brokerId, connectionId, accountId, symbol, positionId, limit, offset) {
-        // Construct params object from individual parameters
-        const params = {
-            brokerId: brokerId,
-            connectionId: connectionId,
-            accountId: accountId,
-            symbol: symbol,
-            positionId: positionId,
-            limit: limit,
-            offset: offset
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getPositionLots(params) {
+        // Use params object (with default empty object)
+        const resolvedParams = params || {}; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2945,7 +3361,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -2957,12 +3373,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/positions/lots',
-            params: params,
+            params: resolvedParams,
             action: 'getPositionLots'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getPositionLotsApiV1BrokersDataPositionsLotsGet({ ...(brokerId !== undefined ? { brokerId: brokerId } : {}), ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(accountId !== undefined ? { accountId: accountId } : {}), ...(symbol !== undefined ? { symbol: symbol } : {}), ...(positionId !== undefined ? { positionId: positionId } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getPositionLotsApiV1BrokersDataPositionsLotsGet({ brokerId: resolvedParams.brokerId, connectionId: resolvedParams.connectionId, accountId: resolvedParams.accountId, symbol: resolvedParams.symbol, positionId: resolvedParams.positionId, limit: resolvedParams.limit, offset: resolvedParams.offset }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -2971,9 +3387,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getPositionLots.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Position Lots completed', {
@@ -2981,6 +3415,7 @@ class BrokersWrapper {
                 action: 'getPositionLots'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3056,11 +3491,11 @@ class BrokersWrapper {
      * Get position lot fills for a specific lot.
      *
      * This endpoint returns all fills associated with a specific position lot.
-     * @param lotId {string}
-     * @param connectionId {string} (optional)
-     * @param limit {number} (optional)
-     * @param offset {number} (optional)
-     * @returns {Promise<FinaticResponse<FDXBrokerPositionLotFill[]>>} Standard response with success/Error/Warning structure
+     * @param params.lotId {string} Position lot ID
+     * @param params.connectionId {string} (optional) Filter by connection ID
+     * @param params.limit {number} (optional) Maximum number of fills to return
+     * @param params.offset {number} (optional) Number of fills to skip for pagination
+     * @returns {Promise<FinaticResponse<PaginatedData<FDXBrokerPositionLotFill>>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/brokers/data/positions/lots/{lot_id}/fills
      * @methodId get_position_lot_fills_api_v1_brokers_data_positions_lots__lot_id__fills_get
@@ -3068,7 +3503,9 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.getPositionLotFills(lotId: '00000000-0000-0000-0000-000000000000');
+     * const result = await finatic.getPositionLotFills({
+      lotId: '00000000-0000-0000-0000-000000000000'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -3080,7 +3517,12 @@ class BrokersWrapper {
      * @example
      * ```typescript-client
      * // Full example with optional parameters
-     * const result = await finatic.getPositionLotFills(lotId: '00000000-0000-0000-0000-000000000000', connectionId: '00000000-0000-0000-0000-000000000000', limit: 100, offset: 0);
+     * const result = await finatic.getPositionLotFills({
+      lotId: '00000000-0000-0000-0000-000000000000',
+      connectionId: '00000000-0000-0000-0000-000000000000',
+      limit: 100,
+      offset: 0
+     * });
      *
      * // Handle response with warnings
      * if (result.success) {
@@ -3093,15 +3535,10 @@ class BrokersWrapper {
      * }
      * ```
      */
-    async getPositionLotFills(lotId, connectionId, limit, offset) {
-        // Construct params object from individual parameters
-        const params = {
-            lotId: lotId,
-            connectionId: connectionId,
-            limit: limit,
-            offset: offset
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getPositionLotFills(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -3112,7 +3549,7 @@ class BrokersWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots/{lot_id}/fills', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots/{lot_id}/fills', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3124,12 +3561,12 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/data/positions/lots/{lot_id}/fills',
-            params: params,
+            params: resolvedParams,
             action: 'getPositionLotFills'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getPositionLotFillsApiV1BrokersDataPositionsLotsLotIdFillsGet({ lotId: lotId, ...(connectionId !== undefined ? { connectionId: connectionId } : {}), ...(limit !== undefined ? { limit: limit } : {}), ...(offset !== undefined ? { offset: offset } : {}) }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getPositionLotFillsApiV1BrokersDataPositionsLotsLotIdFillsGet({ lotId: resolvedParams.lotId, connectionId: resolvedParams.connectionId, limit: resolvedParams.limit, offset: resolvedParams.offset }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3138,9 +3575,27 @@ class BrokersWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = true;
+            const hasOffset = true;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) {
+                // PaginatedData is already imported at top of file
+                const paginationMeta = standardResponse.success.meta?.pagination;
+                if (paginationMeta) {
+                    const paginatedData = new PaginatedData(standardResponse.success.data, {
+                        has_more: paginationMeta.has_more,
+                        next_offset: paginationMeta.next_offset,
+                        current_offset: paginationMeta.current_offset,
+                        limit: paginationMeta.limit,
+                    }, this.getPositionLotFills.bind(this), resolvedParams, this);
+                    standardResponse.success.data = paginatedData;
+                }
+            }
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots/{lot_id}/fills', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/brokers/data/positions/lots/{lot_id}/fills', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Position Lot Fills completed', {
@@ -3148,6 +3603,7 @@ class BrokersWrapper {
                 action: 'getPositionLotFills'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3260,7 +3716,7 @@ class CompanyWrapper {
      * Get Company
      *
      * Get public company details by ID (no user check, no sensitive data).
-     * @param companyId {string}
+     * @param params.companyId {string} Company ID
      * @returns {Promise<FinaticResponse<CompanyResponse>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/company/{company_id}
@@ -3269,7 +3725,9 @@ class CompanyWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.getCompany(companyId: '00000000-0000-0000-0000-000000000000');
+     * const result = await finatic.getCompany({
+      companyId: '00000000-0000-0000-0000-000000000000'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -3279,11 +3737,9 @@ class CompanyWrapper {
      * }
      * ```
      */
-    async getCompany(companyId) {
-        // Construct params object from individual parameters
-        const params = {
-            companyId: companyId
-        }; // Generate request ID
+    async getCompany(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Generate request ID
         const requestId = this._generateRequestId();
         // Input validation (Phase 2B: zod)
         if (this.sdkConfig?.validationEnabled) ;
@@ -3291,7 +3747,7 @@ class CompanyWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/company/{company_id}', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/company/{company_id}', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3303,12 +3759,12 @@ class CompanyWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/company/{company_id}',
-            params: params,
+            params: resolvedParams,
             action: 'getCompany'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getCompanyApiV1CompanyCompanyIdGet({ companyId: companyId }, { headers: { 'x-request-id': requestId } });
+                const apiResponse = await this.api.getCompanyApiV1CompanyCompanyIdGet({ companyId: resolvedParams.companyId }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3317,9 +3773,15 @@ class CompanyWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/company/{company_id}', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/company/{company_id}', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Company completed', {
@@ -3327,6 +3789,7 @@ class CompanyWrapper {
                 action: 'getCompany'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3439,7 +3902,7 @@ class SessionWrapper {
      * Init Session
      *
      * Initialize a new session with company API key.
-     * @param xApiKey {string}
+     * @param params.xApiKey {string} Company API key
      * @returns {Promise<FinaticResponse<TokenResponseData>>} Standard response with success/Error/Warning structure
      *
      * Generated from: POST /api/v1/session/init
@@ -3448,7 +3911,7 @@ class SessionWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.initSession();
+     * const result = await finatic.initSession({});
      *
      * // Access the response data
      * if (result.success) {
@@ -3456,11 +3919,9 @@ class SessionWrapper {
      * }
      * ```
      */
-    async initSession(xApiKey) {
-        // Construct params object from individual parameters
-        const params = {
-            xApiKey: xApiKey
-        }; // Generate request ID
+    async initSession(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Generate request ID
         const requestId = this._generateRequestId();
         // Input validation (Phase 2B: zod)
         if (this.sdkConfig?.validationEnabled) ;
@@ -3468,7 +3929,7 @@ class SessionWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('POST', '/api/v1/session/init', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('POST', '/api/v1/session/init', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3480,12 +3941,12 @@ class SessionWrapper {
             request_id: requestId,
             method: 'POST',
             path: '/api/v1/session/init',
-            params: params,
+            params: resolvedParams,
             action: 'initSession'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.initSessionApiV1SessionInitPost({ xApiKey: xApiKey }, { headers: { 'x-request-id': requestId } });
+                const apiResponse = await this.api.initSessionApiV1SessionInitPost({ xApiKey: resolvedParams.xApiKey }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3494,9 +3955,15 @@ class SessionWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('POST', '/api/v1/session/init', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('POST', '/api/v1/session/init', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Init Session completed', {
@@ -3504,6 +3971,7 @@ class SessionWrapper {
                 action: 'initSession'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3577,8 +4045,8 @@ class SessionWrapper {
      * Start Session
      *
      * Start a session with a one-time token.
-     * @param OneTimeToken {string}
-     * @param body {SessionStartRequest}
+     * @param params.OneTimeToken {string} One-time use token obtained from init_session endpoint to authenticate and start the session
+     * @param params.body {SessionStartRequest} Session start request containing optional user ID to associate with the session
      * @returns {Promise<FinaticResponse<SessionResponseData>>} Standard response with success/Error/Warning structure
      *
      * Generated from: POST /api/v1/session/start
@@ -3587,7 +4055,7 @@ class SessionWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.startSession();
+     * const result = await finatic.startSession({});
      *
      * // Access the response data
      * if (result.success) {
@@ -3595,12 +4063,9 @@ class SessionWrapper {
      * }
      * ```
      */
-    async startSession(OneTimeToken, body) {
-        // Construct params object from individual parameters
-        const params = {
-            OneTimeToken: OneTimeToken,
-            body: body
-        }; // Generate request ID
+    async startSession(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Generate request ID
         const requestId = this._generateRequestId();
         // Input validation (Phase 2B: zod)
         if (this.sdkConfig?.validationEnabled) ;
@@ -3608,7 +4073,7 @@ class SessionWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('POST', '/api/v1/session/start', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('POST', '/api/v1/session/start', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3620,12 +4085,12 @@ class SessionWrapper {
             request_id: requestId,
             method: 'POST',
             path: '/api/v1/session/start',
-            params: params,
+            params: resolvedParams,
             action: 'startSession'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.startSessionApiV1SessionStartPost({ oneTimeToken: OneTimeToken, sessionStartRequest: body }, { headers: { 'x-request-id': requestId } });
+                const apiResponse = await this.api.startSessionApiV1SessionStartPost({ oneTimeToken: resolvedParams.OneTimeToken, sessionStartRequest: resolvedParams.body }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3634,9 +4099,15 @@ class SessionWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('POST', '/api/v1/session/start', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('POST', '/api/v1/session/start', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Start Session completed', {
@@ -3644,6 +4115,7 @@ class SessionWrapper {
                 action: 'startSession'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3720,7 +4192,7 @@ class SessionWrapper {
      *
      * The session must be in ACTIVE or AUTHENTICATING state and the request must come from the same device
      * that initiated the session. Device info is automatically validated from the request.
-     * @param No parameters required for this method
+     * @param params No parameters required for this method
      * @returns {Promise<FinaticResponse<PortalUrlResponse>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/session/portal
@@ -3729,7 +4201,7 @@ class SessionWrapper {
      * @example
      * ```typescript-client
      * // Example with no parameters
-     * const result = await finatic.getPortalUrl();
+     * const result = await finatic.getPortalUrl({});
      *
      * // Access the response data
      * if (result.success) {
@@ -3737,10 +4209,10 @@ class SessionWrapper {
      * }
      * ```
      */
-    async getPortalUrl() {
+    async getPortalUrl(params) {
         // No parameters - use empty params object
-        const params = {}; // Authentication check
-        if (!this.sessionId) {
+        const resolvedParams = params || {}; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -3751,7 +4223,7 @@ class SessionWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/session/portal', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/session/portal', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3763,12 +4235,12 @@ class SessionWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/session/portal',
-            params: params,
+            params: resolvedParams,
             action: 'getPortalUrl'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getPortalUrlApiV1SessionPortalGet({ sessionId: this.sessionId }, { headers: { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, 'x-csrf-token': this.csrfToken, 'x-request-id': requestId } });
+                const apiResponse = await this.api.getPortalUrlApiV1SessionPortalGet({ sessionId: this.sessionId }, { headers: { 'x-request-id': requestId, ...(this.sessionId && this.companyId ? { 'x-session-id': this.sessionId, 'x-company-id': this.companyId, ...(this.csrfToken ? { 'x-csrf-token': this.csrfToken } : {}) } : {}) } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3777,9 +4249,15 @@ class SessionWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/session/portal', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/session/portal', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Portal Url completed', {
@@ -3787,6 +4265,7 @@ class SessionWrapper {
                 action: 'getPortalUrl'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -3871,7 +4350,7 @@ class SessionWrapper {
      * - Generates fresh tokens (not returning stored ones)
      * - Only accessible to authenticated sessions with user_id
      * - Validates that header session_id matches path session_id
-     * @param sessionId {string}
+     * @param params.sessionId {string} Session ID
      * @returns {Promise<FinaticResponse<SessionUserResponse>>} Standard response with success/Error/Warning structure
      *
      * Generated from: GET /api/v1/session/{session_id}/user
@@ -3880,7 +4359,9 @@ class SessionWrapper {
      * @example
      * ```typescript-client
      * // Minimal example with required parameters only
-     * const result = await finatic.getSessionUser(sessionId: 'sess_1234567890abcdef');
+     * const result = await finatic.getSessionUser({
+      sessionId: 'sess_1234567890abcdef'
+     * });
      *
      * // Access the response data
      * if (result.success) {
@@ -3890,12 +4371,10 @@ class SessionWrapper {
      * }
      * ```
      */
-    async getSessionUser(sessionId) {
-        // Construct params object from individual parameters
-        const params = {
-            sessionId: sessionId
-        }; // Authentication check
-        if (!this.sessionId) {
+    async getSessionUser(params) {
+        // Use params object (required parameters present)
+        const resolvedParams = params; // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -3906,7 +4385,7 @@ class SessionWrapper {
         const shouldCache = true;
         const cache = getCache(this.sdkConfig);
         if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-            const cacheKey = generateCacheKey('GET', '/api/v1/session/{session_id}/user', params, this.sdkConfig);
+            const cacheKey = generateCacheKey('GET', '/api/v1/session/{session_id}/user', resolvedParams, this.sdkConfig);
             const cached = cache.get(cacheKey);
             if (cached) {
                 this.logger.debug('Cache hit', { request_id: requestId, cache_key: cacheKey });
@@ -3918,12 +4397,12 @@ class SessionWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/session/{session_id}/user',
-            params: params,
+            params: resolvedParams,
             action: 'getSessionUser'
         });
         try {
             const response = await retryApiCall(async () => {
-                const apiResponse = await this.api.getSessionUserApiV1SessionSessionIdUserGet({ sessionId: sessionId, xSessionId: sessionId }, { headers: { 'x-request-id': requestId } });
+                const apiResponse = await this.api.getSessionUserApiV1SessionSessionIdUserGet({ sessionId: resolvedParams.sessionId, xSessionId: resolvedParams.sessionId }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3932,9 +4411,15 @@ class SessionWrapper {
                 throw new Error('Unexpected response shape: missing success field');
             }
             // Convert response to plain object, removing _id fields recursively
+            // Use 'any' for initial type to allow PaginatedData assignment, then assert final type
             const standardResponse = convertToPlainObject(responseData);
+            // Phase 2: Wrap paginated responses with PaginatedData
+            const hasLimit = false;
+            const hasOffset = false;
+            const hasPagination = hasLimit && hasOffset;
+            if (hasPagination && standardResponse.success?.data && Array.isArray(standardResponse.success.data) && standardResponse.success.meta) ;
             if (cache && this.sdkConfig?.cacheEnabled && shouldCache) {
-                const cacheKey = generateCacheKey('GET', '/api/v1/session/{session_id}/user', params, this.sdkConfig);
+                const cacheKey = generateCacheKey('GET', '/api/v1/session/{session_id}/user', resolvedParams, this.sdkConfig);
                 cache.set(cacheKey, standardResponse, this.sdkConfig.cacheTtl || 300);
             }
             this.logger.debug('Get Session User completed', {
@@ -3942,6 +4427,7 @@ class SessionWrapper {
                 action: 'getSessionUser'
             });
             // Phase 2C: Return standard response structure (plain objects with _id fields removed)
+            // Type assertion to final return type (handles both paginated and non-paginated responses)
             return standardResponse;
         }
         catch (error) {
@@ -4690,8 +5176,8 @@ const SessionApiAxiosParamCreator = function (configuration) {
         /**
          * Start a session with a one-time token.
          * @summary Start Session
-         * @param {string} oneTimeToken
-         * @param {SessionStartRequest} sessionStartRequest
+         * @param {string} oneTimeToken One-time use token obtained from init_session endpoint to authenticate and start the session
+         * @param {SessionStartRequest} sessionStartRequest Session start request containing optional user ID to associate with the session
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -4774,8 +5260,8 @@ const SessionApiFp = function (configuration) {
         /**
          * Start a session with a one-time token.
          * @summary Start Session
-         * @param {string} oneTimeToken
-         * @param {SessionStartRequest} sessionStartRequest
+         * @param {string} oneTimeToken One-time use token obtained from init_session endpoint to authenticate and start the session
+         * @param {SessionStartRequest} sessionStartRequest Session start request containing optional user ID to associate with the session
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -6310,11 +6796,13 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         }
         const sessionId = data?.session_id || '';
         const companyId = data?.company_id || '';
+        const responseUserId = data?.user_id || '';
         // csrf_token is not in SessionResponseData, get from response headers if available
         const csrfToken = data?.csrf_token || '';
         this.logger.debug?.('_startSession extracted data', {
             sessionId,
             companyId,
+            responseUserId,
             csrfToken,
             fullData: data,
             dataKeys: data ? Object.keys(data) : []
@@ -6336,6 +6824,13 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 responseKeys: response ? Object.keys(response) : []
             });
         }
+        // Store userId if present in response (for getUserId() and isAuthed())
+        // Use userId from response if parameter wasn't provided, or if response has a different userId
+        const finalUserId = responseUserId || userId;
+        if (finalUserId) {
+            this.userId = finalUserId;
+            this.logger.debug?.('_startSession set userId', { userId: finalUserId, source: responseUserId ? 'response' : 'parameter' });
+        }
         return { session_id: sessionId, company_id: companyId };
     }
     /**
@@ -6347,28 +6842,30 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      *
      * @methodId get_portal_url_api_v1_session_portal_get
      * @category session
-     * @param theme - Optional theme preset or custom theme object
-     * @param brokers - Optional array of broker IDs to filter
-     * @param email - Optional email address
-     * @param mode - Optional mode ('light' or 'dark')
+     * @param params - Optional parameters object
+     * @param params.theme - Optional theme preset or custom theme object
+     * @param params.brokers - Optional array of broker IDs to filter
+     * @param params.email - Optional email address
+     * @param params.mode - Optional mode ('light' or 'dark')
      * @returns Portal URL string
      * @example
      * ```typescript-client
-     * const url = await finatic.getPortalUrl('dark', ['broker-1'], 'user@example.com', 'dark');
+     * const url = await finatic.getPortalUrl({ theme: 'default', brokers: ['broker-1'], email: 'user@example.com', mode: 'dark' });
      * ```
      * @example
      * ```typescript-server
-     * const url = await finatic.getPortalUrl('dark', ['broker-1'], 'user@example.com', 'dark');
+     * const url = await finatic.getPortalUrl({ theme: 'default', brokers: ['broker-1'], email: 'user@example.com', mode: 'dark' });
      * ```
      * @example
      * ```python
-     * url = await finatic.get_portal_url('dark', ['broker-1'], 'user@example.com', 'dark')
+     * url = await finatic.get_portal_url(theme='default', brokers=['broker-1'], email='user@example.com', mode='dark')
      * ```
      */
-    async getPortalUrl(theme, brokers, email, mode) {
+    async getPortalUrl(params) {
         if (!this.sessionId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
+        const { theme, brokers, email, mode } = params || {};
         // Get raw portal URL from SessionApi directly (not a wrapper)
         const axiosResponse = await this.sessionApi.getPortalUrlApiV1SessionPortalGet({
             sessionId: this.sessionId,
@@ -6442,29 +6939,35 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      *
      * @methodId open_portal_client_sdk
      * @category session
-     * @param theme - Optional theme preset or custom theme object
-     * @param brokers - Optional array of broker IDs to filter
-     * @param email - Optional email address
-     * @param mode - Optional mode ('light' or 'dark')
+     * @param params - Optional parameters object
+     * @param params.theme - Optional theme preset or custom theme object
+     * @param params.brokers - Optional array of broker IDs to filter
+     * @param params.email - Optional email address
+     * @param params.mode - Optional mode ('light' or 'dark')
      * @param onSuccess - Optional callback when portal authentication succeeds
      * @param onError - Optional callback when portal authentication fails
      * @param onClose - Optional callback when portal is closed
      * @returns Promise that resolves when portal is opened
      * @example
      * ```typescript-client
-     * await finatic.openPortal('dark', ['broker-1'], 'user@example.com', 'dark',
+     * await finatic.openPortal({
+     *   theme: 'default',
+     *   brokers: ['broker-1'],
+     *   email: 'user@example.com',
+     *   mode: 'dark'
+     * },
      *   (userId) => console.log('User authenticated:', userId),
      *   (error) => console.error('Portal error:', error),
      *   () => console.log('Portal closed')
      * );
      * ```
      */
-    async openPortal(theme, brokers, email, mode, onSuccess, onError, onClose) {
+    async openPortal(params, onSuccess, onError, onClose) {
         if (!this.sessionId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Get portal URL with all parameters
-        const portalUrl = await this.getPortalUrl(theme, brokers, email, mode);
+        const portalUrl = await this.getPortalUrl(params);
         // Create portal UI if not exists
         if (!this.portalUI) {
             this.portalUI = new PortalUI(this.sdkConfig.baseUrl || 'https://api.finatic.dev');
@@ -6651,7 +7154,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getCompany(params) {
-        return await this.company.getCompany(params?.companyId);
+        return await this.company.getCompany(params);
     }
     /**
      * Get Brokers
@@ -6809,7 +7312,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async disconnectCompanyFromBroker(params) {
-        return await this.brokers.disconnectCompanyFromBroker(params?.connectionId);
+        return await this.brokers.disconnectCompanyFromBroker(params);
     }
     /**
      * Get Orders
@@ -6889,7 +7392,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getOrders(params) {
-        return await this.brokers.getOrders(params?.brokerId, params?.connectionId, params?.accountId, params?.symbol, params?.orderStatus, params?.side, params?.assetType, params?.limit, params?.offset, params?.createdAfter, params?.createdBefore, params?.includeMetadata);
+        return await this.brokers.getOrders(params);
     }
     /**
      * Get Positions
@@ -6969,7 +7472,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getPositions(params) {
-        return await this.brokers.getPositions(params?.brokerId, params?.connectionId, params?.accountId, params?.symbol, params?.side, params?.assetType, params?.positionStatus, params?.limit, params?.offset, params?.updatedAfter, params?.updatedBefore, params?.includeMetadata);
+        return await this.brokers.getPositions(params);
     }
     /**
      * Get Balances
@@ -7049,7 +7552,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getBalances(params) {
-        return await this.brokers.getBalances(params?.brokerId, params?.connectionId, params?.accountId, params?.isEndOfDaySnapshot, params?.limit, params?.offset, params?.balanceCreatedAfter, params?.balanceCreatedBefore, params?.includeMetadata);
+        return await this.brokers.getBalances(params);
     }
     /**
      * Get Accounts
@@ -7129,7 +7632,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getAccounts(params) {
-        return await this.brokers.getAccounts(params?.brokerId, params?.connectionId, params?.accountType, params?.status, params?.currency, params?.limit, params?.offset, params?.includeMetadata);
+        return await this.brokers.getAccounts(params);
     }
     /**
      * Get Order Fills
@@ -7217,7 +7720,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getOrderFills(params) {
-        return await this.brokers.getOrderFills(params?.orderId, params?.connectionId, params?.limit, params?.offset, params?.includeMetadata);
+        return await this.brokers.getOrderFills(params);
     }
     /**
      * Get Order Events
@@ -7305,7 +7808,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getOrderEvents(params) {
-        return await this.brokers.getOrderEvents(params?.orderId, params?.connectionId, params?.limit, params?.offset, params?.includeMetadata);
+        return await this.brokers.getOrderEvents(params);
     }
     /**
      * Get Order Groups
@@ -7384,7 +7887,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getOrderGroups(params) {
-        return await this.brokers.getOrderGroups(params?.brokerId, params?.connectionId, params?.limit, params?.offset, params?.createdAfter, params?.createdBefore, params?.includeMetadata);
+        return await this.brokers.getOrderGroups(params);
     }
     /**
      * Get Position Lots
@@ -7464,7 +7967,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getPositionLots(params) {
-        return await this.brokers.getPositionLots(params?.brokerId, params?.connectionId, params?.accountId, params?.symbol, params?.positionId, params?.limit, params?.offset);
+        return await this.brokers.getPositionLots(params);
     }
     /**
      * Get Position Lot Fills
@@ -7552,7 +8055,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
      * ```
      */
     async getPositionLotFills(params) {
-        return await this.brokers.getPositionLotFills(params?.lotId, params?.connectionId, params?.limit, params?.offset);
+        return await this.brokers.getPositionLotFills(params);
     }
     /**
      * Get all Orders across all pages.
@@ -7623,7 +8126,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getOrders(filterParams?.brokerId, filterParams?.connectionId, filterParams?.accountId, filterParams?.symbol, filterParams?.orderStatus, filterParams?.side, filterParams?.assetType, limit, offset, filterParams?.createdAfter, filterParams?.createdBefore, filterParams?.includeMetadata);
+            const response = await this.brokers.getOrders({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -7633,10 +8136,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -7728,7 +8237,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getPositions(filterParams?.brokerId, filterParams?.connectionId, filterParams?.accountId, filterParams?.symbol, filterParams?.side, filterParams?.assetType, filterParams?.positionStatus, limit, offset, filterParams?.updatedAfter, filterParams?.updatedBefore, filterParams?.includeMetadata);
+            const response = await this.brokers.getPositions({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -7738,10 +8247,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -7833,7 +8348,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getBalances(filterParams?.brokerId, filterParams?.connectionId, filterParams?.accountId, filterParams?.isEndOfDaySnapshot, limit, offset, filterParams?.balanceCreatedAfter, filterParams?.balanceCreatedBefore, filterParams?.includeMetadata);
+            const response = await this.brokers.getBalances({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -7843,10 +8358,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -7938,7 +8459,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getAccounts(filterParams?.brokerId, filterParams?.connectionId, filterParams?.accountType, filterParams?.status, filterParams?.currency, limit, offset, filterParams?.includeMetadata);
+            const response = await this.brokers.getAccounts({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -7948,10 +8469,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8042,7 +8569,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getOrderFills(filterParams?.orderId, filterParams?.connectionId, limit, offset, filterParams?.includeMetadata);
+            const response = await this.brokers.getOrderFills({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -8052,10 +8579,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8146,7 +8679,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getOrderEvents(filterParams?.orderId, filterParams?.connectionId, limit, offset, filterParams?.includeMetadata);
+            const response = await this.brokers.getOrderEvents({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -8156,10 +8689,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8251,7 +8790,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getOrderGroups(filterParams?.brokerId, filterParams?.connectionId, limit, offset, filterParams?.createdAfter, filterParams?.createdBefore, filterParams?.includeMetadata);
+            const response = await this.brokers.getOrderGroups({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -8261,10 +8800,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8356,7 +8901,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getPositionLots(filterParams?.brokerId, filterParams?.connectionId, filterParams?.accountId, filterParams?.symbol, filterParams?.positionId, limit, offset);
+            const response = await this.brokers.getPositionLots({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -8366,10 +8911,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8459,7 +9010,7 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
         let lastError = null;
         let warnings = [];
         while (true) {
-            const response = await this.brokers.getPositionLotFills(filterParams?.lotId, filterParams?.connectionId, limit, offset);
+            const response = await this.brokers.getPositionLotFills({ ...filterParams, limit, offset });
             // Collect warnings from each page
             if (response.warning && Array.isArray(response.warning)) {
                 warnings.push(...response.warning);
@@ -8469,10 +9020,16 @@ let FinaticConnect$1 = class FinaticConnect extends EventEmitter {
                 break;
             }
             const result = response.success?.data || [];
-            if (!result || result.length === 0)
+            // Extract items from PaginatedData if it's a PaginatedData object, otherwise use as-is
+            // PaginatedData has array-like behavior but we extract items for getAll* methods
+            const items = result && typeof result === 'object' && 'items' in result && Array.isArray(result.items)
+                ? result.items
+                : (Array.isArray(result) ? result : [result]);
+            if (!items || items.length === 0)
                 break;
-            allData.push(...(Array.isArray(result) ? result : [result]));
-            if (result.length < limit)
+            allData.push(...items);
+            // If we got fewer items than the limit, there are no more pages
+            if (items.length < limit)
                 break;
             offset += limit;
         }
@@ -8517,5 +9074,5 @@ class FinaticConnect extends FinaticConnect$1 {
 // Marker to verify custom class is being used
 FinaticConnect.__CUSTOM_CLASS__ = true;
 
-export { AccountStatus, ApiError, BrokerDataAccountTypeEnum, BrokerDataAssetTypeEnum, BrokerDataOrderSideEnum, BrokerDataOrderStatusEnum, BrokerDataPositionStatusEnum, BrokersApi, BrokersApiAxiosParamCreator, BrokersApiFactory, BrokersApiFp, BrokersWrapper, CompanyApi, CompanyApiAxiosParamCreator, CompanyApiFactory, CompanyApiFp, CompanyWrapper, Configuration, EventEmitter, FDXAccountStatus, FDXAccountType, FDXAssetType, FDXBalanceType, FDXOrderClass, FDXOrderEventType, FDXOrderGroupType, FDXOrderSide, FDXOrderStatus, FDXOrderType, FDXPositionSide, FDXPositionStatus, FDXSecurityIdType, FDXTimeInForce, FinaticConnect, FinaticError, SessionApi, SessionApiAxiosParamCreator, SessionApiFactory, SessionApiFp, SessionStatus, SessionWrapper, ValidationError, addErrorInterceptor, addRequestInterceptor, addResponseInterceptor, appendBrokerFilterToURL, appendThemeToURL, applyErrorInterceptors, applyRequestInterceptors, applyResponseInterceptors, coerceEnumValue, convertToPlainObject, defaultConfig, generateCacheKey, generateRequestId, getCache, getConfig, getLogger, handleError, numberSchema, retryApiCall, stringSchema, unwrapAxiosResponse, validateParams };
+export { AccountStatus, ApiError, BrokerDataAccountTypeEnum, BrokerDataAssetTypeEnum, BrokerDataOrderSideEnum, BrokerDataOrderStatusEnum, BrokerDataPositionStatusEnum, BrokersApi, BrokersApiAxiosParamCreator, BrokersApiFactory, BrokersApiFp, BrokersWrapper, CompanyApi, CompanyApiAxiosParamCreator, CompanyApiFactory, CompanyApiFp, CompanyWrapper, Configuration, EventEmitter, FDXAccountStatus, FDXAccountType, FDXAssetType, FDXBalanceType, FDXOrderClass, FDXOrderEventType, FDXOrderGroupType, FDXOrderSide, FDXOrderStatus, FDXOrderType, FDXPositionSide, FDXPositionStatus, FDXSecurityIdType, FDXTimeInForce, FinaticConnect, FinaticError, PaginatedData, SessionApi, SessionApiAxiosParamCreator, SessionApiFactory, SessionApiFp, SessionStatus, SessionWrapper, ValidationError, addErrorInterceptor, addRequestInterceptor, addResponseInterceptor, appendBrokerFilterToURL, appendThemeToURL, applyErrorInterceptors, applyRequestInterceptors, applyResponseInterceptors, coerceEnumValue, convertToPlainObject, defaultConfig, generateCacheKey, generateRequestId, getCache, getConfig, getLogger, handleError, numberSchema, retryApiCall, stringSchema, unwrapAxiosResponse, validateParams };
 //# sourceMappingURL=index.mjs.map