@finatic/client 0.9.2 → 0.9.4

package/dist/index.mjs

@@ -616,7 +616,11 @@ function coerceEnumValue(input, EnumObj, enumName) {
         // Direct match by value (case-insensitive)
         const valueMatch = values.find(v => v.toLowerCase() === normalized.toLowerCase());
         if (valueMatch) {
-            return valueMatch;
+            // Find the enum key that has this value
+            const matchingKey = Object.keys(EnumObj).find(k => EnumObj[k] === valueMatch);
+            if (matchingKey) {
+                return EnumObj[matchingKey]; // Returns enum member (e.g., BrokerDataOrderStatusEnum.Filled)
+            }
         }
         // Match by key name (case-insensitive)
         const keyMatch = Object.keys(EnumObj).find(k => String(k).toLowerCase() === normalized.toLowerCase());
@@ -764,34 +768,6 @@ var BrokerDataOrderSideEnum;
     BrokerDataOrderSideEnum["Sell"] = "sell";
 })(BrokerDataOrderSideEnum || (BrokerDataOrderSideEnum = {}));
 
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Finatic FastAPI Backend
- * FinaticAPI REST API
- *
- * The version of the OpenAPI document: 1.0.0
- *
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-var BrokerDataOrderStatusEnum;
-(function (BrokerDataOrderStatusEnum) {
-    BrokerDataOrderStatusEnum["Submitted"] = "submitted";
-    BrokerDataOrderStatusEnum["New"] = "new";
-    BrokerDataOrderStatusEnum["PartiallyFilled"] = "partially_filled";
-    BrokerDataOrderStatusEnum["Filled"] = "filled";
-    BrokerDataOrderStatusEnum["PendingCancel"] = "pending_cancel";
-    BrokerDataOrderStatusEnum["Cancelled"] = "cancelled";
-    BrokerDataOrderStatusEnum["Rejected"] = "rejected";
-    BrokerDataOrderStatusEnum["Expired"] = "expired";
-    BrokerDataOrderStatusEnum["Created"] = "created";
-    BrokerDataOrderStatusEnum["Received"] = "received";
-    BrokerDataOrderStatusEnum["Queued"] = "queued";
-})(BrokerDataOrderStatusEnum || (BrokerDataOrderStatusEnum = {}));
-
 /* tslint:disable */
 /* eslint-disable */
 /**
@@ -1209,6 +1185,273 @@ 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();
+    }
+    /**
+     * Convert to JSON - returns just the items array for serialization.
+     * This allows clean serialization without exposing internal methods.
+     *
+     * @returns The items array
+     *
+     * @example
+     * ```typescript
+     * const orders = await sdk.getOrders();
+     * console.log(orders);  // Shows full PaginatedData with methods
+     * console.log(orders.toJSON());  // Shows just the items array
+     * JSON.stringify(orders);  // Automatically uses toJSON()
+     * ```
+     */
+    toJSON() {
+        return this.items;
+    }
+    /**
+     * 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).
  *
@@ -1258,7 +1501,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/
@@ -1267,7 +1510,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) {
@@ -1275,9 +1518,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) ;
@@ -1285,7 +1528,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 });
@@ -1297,7 +1540,7 @@ class BrokersWrapper {
             request_id: requestId,
             method: 'GET',
             path: '/api/v1/brokers/',
-            params: params,
+            params: resolvedParams,
             action: 'getBrokers'
         });
         try {
@@ -1311,9 +1554,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', {
@@ -1321,6 +1570,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) {
@@ -1398,7 +1648,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
@@ -1407,7 +1657,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) {
@@ -1415,10 +1665,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
@@ -1429,7 +1679,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 });
@@ -1441,12 +1691,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
@@ -1455,9 +1705,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', {
@@ -1465,6 +1721,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) {
@@ -1541,7 +1798,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}
@@ -1550,7 +1807,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) {
@@ -1560,12 +1819,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
@@ -1576,7 +1833,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 });
@@ -1588,12 +1845,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 ?? null }, { 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
@@ -1602,9 +1859,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', {
@@ -1612,6 +1875,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) {
@@ -1688,19 +1952,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 or internal account UUID
+     * @param params.symbol {string} (optional) Filter by symbol
+     * @param params.orderStatus {string} (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
@@ -1708,7 +1972,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) {
@@ -1718,7 +1982,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) {
@@ -1731,23 +1999,22 @@ 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?.side !== undefined) {
+            const coerced = coerceEnumValue(params.side, BrokerDataOrderSideEnum, 'side');
+            if (coerced !== undefined) {
+                params.side = coerced;
+            }
+        }
+        if (params?.assetType !== undefined) {
+            const coerced = coerceEnumValue(params.assetType, BrokerDataAssetTypeEnum, 'assetType');
+            if (coerced !== undefined) {
+                params.assetType = coerced;
+            }
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1758,7 +2025,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 });
@@ -1770,12 +2037,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.accountId !== undefined ? { accountId: resolvedParams.accountId } : {}), ...(resolvedParams.symbol !== undefined ? { symbol: resolvedParams.symbol } : {}), ...(resolvedParams.orderStatus !== undefined ? { orderStatus: resolvedParams.orderStatus } : {}), ...(resolvedParams.side !== undefined ? { side: resolvedParams.side } : {}), ...(resolvedParams.assetType !== undefined ? { assetType: resolvedParams.assetType } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.createdAfter !== undefined ? { createdAfter: resolvedParams.createdAfter } : {}), ...(resolvedParams.createdBefore !== undefined ? { createdBefore: resolvedParams.createdBefore } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -1784,9 +2051,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', {
@@ -1794,6 +2079,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) {
@@ -1870,19 +2156,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 or internal account UUID
+     * @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
@@ -1890,7 +2176,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) {
@@ -1900,7 +2186,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) {
@@ -1913,23 +2203,28 @@ 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) {
+            const coerced = coerceEnumValue(params.side, BrokerDataOrderSideEnum, 'side');
+            if (coerced !== undefined) {
+                params.side = coerced;
+            }
+        }
+        if (params?.assetType !== undefined) {
+            const coerced = coerceEnumValue(params.assetType, BrokerDataAssetTypeEnum, 'assetType');
+            if (coerced !== undefined) {
+                params.assetType = coerced;
+            }
+        }
+        if (params?.positionStatus !== undefined) {
+            const coerced = coerceEnumValue(params.positionStatus, BrokerDataPositionStatusEnum, 'positionStatus');
+            if (coerced !== undefined) {
+                params.positionStatus = coerced;
+            }
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -1940,7 +2235,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 });
@@ -1952,12 +2247,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.accountId !== undefined ? { accountId: resolvedParams.accountId } : {}), ...(resolvedParams.symbol !== undefined ? { symbol: resolvedParams.symbol } : {}), ...(resolvedParams.side !== undefined ? { side: resolvedParams.side } : {}), ...(resolvedParams.assetType !== undefined ? { assetType: resolvedParams.assetType } : {}), ...(resolvedParams.positionStatus !== undefined ? { positionStatus: resolvedParams.positionStatus } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.updatedAfter !== undefined ? { updatedAfter: resolvedParams.updatedAfter } : {}), ...(resolvedParams.updatedBefore !== undefined ? { updatedBefore: resolvedParams.updatedBefore } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -1966,9 +2261,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', {
@@ -1976,6 +2289,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) {
@@ -2052,16 +2366,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 or internal account UUID
+     * @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
@@ -2069,7 +2383,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) {
@@ -2079,7 +2393,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) {
@@ -2092,20 +2410,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
@@ -2116,7 +2424,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 });
@@ -2128,12 +2436,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.accountId !== undefined ? { accountId: resolvedParams.accountId } : {}), ...(resolvedParams.isEndOfDaySnapshot !== undefined ? { isEndOfDaySnapshot: resolvedParams.isEndOfDaySnapshot } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.balanceCreatedAfter !== undefined ? { balanceCreatedAfter: resolvedParams.balanceCreatedAfter } : {}), ...(resolvedParams.balanceCreatedBefore !== undefined ? { balanceCreatedBefore: resolvedParams.balanceCreatedBefore } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -2142,9 +2450,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', {
@@ -2152,6 +2478,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) {
@@ -2228,15 +2555,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
@@ -2244,7 +2571,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) {
@@ -2254,7 +2581,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) {
@@ -2267,19 +2598,16 @@ 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) {
+            const coerced = coerceEnumValue(params.accountType, BrokerDataAccountTypeEnum, 'accountType');
+            if (coerced !== undefined) {
+                params.accountType = coerced;
+            }
+        } // Authentication check
+        if (!this.sessionId || !this.companyId) {
             throw new Error('Session not initialized. Call startSession() first.');
         }
         // Generate request ID
@@ -2290,7 +2618,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 });
@@ -2302,12 +2630,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.accountType !== undefined ? { accountType: resolvedParams.accountType } : {}), ...(resolvedParams.status !== undefined ? { status: resolvedParams.status } : {}), ...(resolvedParams.currency !== undefined ? { currency: resolvedParams.currency } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -2316,9 +2644,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', {
@@ -2326,6 +2672,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) {
@@ -2401,12 +2748,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
@@ -2414,7 +2761,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) {
@@ -2426,7 +2775,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) {
@@ -2439,16 +2793,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
@@ -2459,7 +2807,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 });
@@ -2471,12 +2819,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 ?? null, ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -2485,9 +2833,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', {
@@ -2495,6 +2861,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) {
@@ -2570,12 +2937,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
@@ -2583,7 +2950,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) {
@@ -2595,7 +2964,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) {
@@ -2608,16 +2982,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
@@ -2628,7 +2996,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 });
@@ -2640,12 +3008,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 ?? null, ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -2654,9 +3022,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', {
@@ -2664,6 +3050,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) {
@@ -2739,14 +3126,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
@@ -2754,7 +3141,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) {
@@ -2764,7 +3151,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) {
@@ -2777,18 +3168,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
@@ -2799,7 +3182,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 });
@@ -2811,12 +3194,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { offset: resolvedParams.offset } : {}), ...(resolvedParams.createdAfter !== undefined ? { createdAfter: resolvedParams.createdAfter } : {}), ...(resolvedParams.createdBefore !== undefined ? { createdBefore: resolvedParams.createdBefore } : {}), ...(resolvedParams.includeMetadata !== undefined ? { 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
@@ -2825,9 +3208,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', {
@@ -2835,6 +3236,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) {
@@ -2911,14 +3313,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
@@ -2926,7 +3328,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) {
@@ -2936,7 +3338,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) {
@@ -2949,18 +3355,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
@@ -2971,7 +3369,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 });
@@ -2983,12 +3381,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({ ...(resolvedParams.brokerId !== undefined ? { brokerId: resolvedParams.brokerId } : {}), ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.accountId !== undefined ? { accountId: resolvedParams.accountId } : {}), ...(resolvedParams.symbol !== undefined ? { symbol: resolvedParams.symbol } : {}), ...(resolvedParams.positionId !== undefined ? { positionId: resolvedParams.positionId } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { 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
@@ -2997,9 +3395,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', {
@@ -3007,6 +3423,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) {
@@ -3082,11 +3499,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
@@ -3094,7 +3511,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) {
@@ -3106,7 +3525,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) {
@@ -3119,15 +3543,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
@@ -3138,7 +3557,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 });
@@ -3150,12 +3569,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 ?? null, ...(resolvedParams.connectionId !== undefined ? { connectionId: resolvedParams.connectionId } : {}), ...(resolvedParams.limit !== undefined ? { limit: resolvedParams.limit } : {}), ...(resolvedParams.offset !== undefined ? { 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
@@ -3164,9 +3583,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', {
@@ -3174,6 +3611,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) {
@@ -3286,7 +3724,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}
@@ -3295,7 +3733,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) {
@@ -3305,11 +3745,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) ;
@@ -3317,7 +3755,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 });
@@ -3329,12 +3767,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 ?? null }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3343,9 +3781,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', {
@@ -3353,6 +3797,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) {
@@ -3465,7 +3910,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
@@ -3474,7 +3919,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) {
@@ -3482,11 +3927,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) ;
@@ -3494,7 +3937,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 });
@@ -3506,12 +3949,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 ?? null }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3520,9 +3963,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', {
@@ -3530,6 +3979,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) {
@@ -3603,8 +4053,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
@@ -3613,7 +4063,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) {
@@ -3621,12 +4071,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) ;
@@ -3634,7 +4081,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 });
@@ -3646,12 +4093,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 ?? null, sessionStartRequest: resolvedParams.body ?? null }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3660,9 +4107,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', {
@@ -3670,6 +4123,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) {
@@ -3746,7 +4200,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
@@ -3755,7 +4209,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) {
@@ -3763,10 +4217,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
@@ -3777,7 +4231,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 });
@@ -3789,12 +4243,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
@@ -3803,9 +4257,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', {
@@ -3813,6 +4273,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) {
@@ -3897,7 +4358,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
@@ -3906,7 +4367,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) {
@@ -3916,12 +4379,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
@@ -3932,7 +4393,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 });
@@ -3944,12 +4405,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 ?? null, xSessionId: resolvedParams.sessionId ?? null }, { headers: { 'x-request-id': requestId } });
                 return await applyResponseInterceptors(apiResponse, this.sdkConfig);
             }, {}, this.sdkConfig);
             // Unwrap axios response immediately - get FinaticResponse object
@@ -3958,9 +4419,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', {
@@ -3968,6 +4435,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) {
@@ -4716,8 +5184,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}
          */
@@ -4800,8 +5268,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}
          */
@@ -5016,7 +5484,7 @@ const BrokersApiAxiosParamCreator = function (configuration) {
          * @summary Get Balances
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {boolean | null} [isEndOfDaySnapshot] Filter by end-of-day snapshot status (true/false)
          * @param {number} [limit] Maximum number of balances to return
          * @param {number} [offset] Number of balances to skip for pagination
@@ -5253,9 +5721,9 @@ const BrokersApiAxiosParamCreator = function (configuration) {
          * @summary Get Orders
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {string | null} [symbol] Filter by symbol
-         * @param {BrokerDataOrderStatusEnum | null} [orderStatus] Filter by order status (e.g., \&#39;filled\&#39;, \&#39;pending_new\&#39;, \&#39;cancelled\&#39;)
+         * @param {string | null} [orderStatus] Filter by order status (e.g., \&#39;filled\&#39;, \&#39;pending_new\&#39;, \&#39;cancelled\&#39;)
          * @param {BrokerDataOrderSideEnum | null} [side] Filter by order side (e.g., \&#39;buy\&#39;, \&#39;sell\&#39;)
          * @param {BrokerDataAssetTypeEnum | null} [assetType] Filter by asset type (e.g., \&#39;stock\&#39;, \&#39;option\&#39;, \&#39;crypto\&#39;, \&#39;future\&#39;)
          * @param {number} [limit] Maximum number of orders to return
@@ -5424,7 +5892,7 @@ const BrokersApiAxiosParamCreator = function (configuration) {
          * @summary Get Positions
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {string | null} [symbol] Filter by symbol
          * @param {BrokerDataOrderSideEnum | null} [side] Filter by position side (e.g., \&#39;long\&#39;, \&#39;short\&#39;)
          * @param {BrokerDataAssetTypeEnum | null} [assetType] Filter by asset type (e.g., \&#39;stock\&#39;, \&#39;option\&#39;, \&#39;crypto\&#39;, \&#39;future\&#39;)
@@ -5567,7 +6035,7 @@ const BrokersApiFp = function (configuration) {
          * @summary Get Balances
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {boolean | null} [isEndOfDaySnapshot] Filter by end-of-day snapshot status (true/false)
          * @param {number} [limit] Maximum number of balances to return
          * @param {number} [offset] Number of balances to skip for pagination
@@ -5653,9 +6121,9 @@ const BrokersApiFp = function (configuration) {
          * @summary Get Orders
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {string | null} [symbol] Filter by symbol
-         * @param {BrokerDataOrderStatusEnum | null} [orderStatus] Filter by order status (e.g., \&#39;filled\&#39;, \&#39;pending_new\&#39;, \&#39;cancelled\&#39;)
+         * @param {string | null} [orderStatus] Filter by order status (e.g., \&#39;filled\&#39;, \&#39;pending_new\&#39;, \&#39;cancelled\&#39;)
          * @param {BrokerDataOrderSideEnum | null} [side] Filter by order side (e.g., \&#39;buy\&#39;, \&#39;sell\&#39;)
          * @param {BrokerDataAssetTypeEnum | null} [assetType] Filter by asset type (e.g., \&#39;stock\&#39;, \&#39;option\&#39;, \&#39;crypto\&#39;, \&#39;future\&#39;)
          * @param {number} [limit] Maximum number of orders to return
@@ -5712,7 +6180,7 @@ const BrokersApiFp = function (configuration) {
          * @summary Get Positions
          * @param {string | null} [brokerId] Filter by broker ID
          * @param {string | null} [connectionId] Filter by connection ID
-         * @param {string | null} [accountId] Filter by broker provided account ID
+         * @param {string | null} [accountId] Filter by broker provided account ID or internal account UUID
          * @param {string | null} [symbol] Filter by symbol
          * @param {BrokerDataOrderSideEnum | null} [side] Filter by position side (e.g., \&#39;long\&#39;, \&#39;short\&#39;)
          * @param {BrokerDataAssetTypeEnum | null} [assetType] Filter by asset type (e.g., \&#39;stock\&#39;, \&#39;option\&#39;, \&#39;crypto\&#39;, \&#39;future\&#39;)
@@ -6336,11 +6804,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) : []
@@ -6362,6 +6832,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 };
     }
     /**
@@ -6373,28 +6850,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,
@@ -6468,29 +6947,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');
@@ -6677,7 +7162,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
@@ -6835,7 +7320,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
@@ -6915,7 +7400,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
@@ -6995,7 +7480,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
@@ -7075,7 +7560,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
@@ -7155,7 +7640,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
@@ -7243,7 +7728,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
@@ -7331,7 +7816,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
@@ -7410,7 +7895,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
@@ -7490,7 +7975,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
@@ -7578,7 +8063,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.
@@ -7649,7 +8134,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);
@@ -7659,10 +8144,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;
         }
@@ -7754,7 +8245,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);
@@ -7764,10 +8255,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;
         }
@@ -7859,7 +8356,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);
@@ -7869,10 +8366,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;
         }
@@ -7964,7 +8467,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);
@@ -7974,10 +8477,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;
         }
@@ -8068,7 +8577,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);
@@ -8078,10 +8587,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;
         }
@@ -8172,7 +8687,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);
@@ -8182,10 +8697,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;
         }
@@ -8277,7 +8798,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);
@@ -8287,10 +8808,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;
         }
@@ -8382,7 +8909,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);
@@ -8392,10 +8919,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;
         }
@@ -8485,7 +9018,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);
@@ -8495,10 +9028,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;
         }
@@ -8543,5 +9082,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, 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