@discomedia/utils 1.0.63 → 1.0.65

package/dist/index.mjs

@@ -1146,6 +1146,7 @@ function isOpenRouterModel(model) {
     const openRouterModels = [
         'openai/gpt-5',
         'openai/gpt-5-mini',
+        'openai/gpt-5.4-mini',
         'openai/gpt-5-nano',
         'openai/gpt-5.1',
         'openai/gpt-5.4',
@@ -1614,7 +1615,7 @@ const safeJSON = (text) => {
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
-const VERSION = '6.27.0'; // x-release-please-version
+const VERSION = '6.32.0'; // x-release-please-version
 
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 const isRunningInBrowser = () => {
@@ -4858,7 +4859,7 @@ class Speech extends APIResource {
      * const speech = await client.audio.speech.create({
      *   input: 'input',
      *   model: 'string',
-     *   voice: 'ash',
+     *   voice: 'string',
      * });
      *
      * const content = await speech.blob();
@@ -8139,7 +8140,7 @@ class Videos extends APIResource {
      * Create a new video generation job from a prompt and optional reference assets.
      */
     create(body, options) {
-        return this._client.post('/videos', maybeMultipartFormRequestOptions({ body, ...options }, this._client));
+        return this._client.post('/videos', multipartFormRequestOptions({ body, ...options }, this._client));
     }
     /**
      * Fetch the latest metadata for a generated video.
@@ -8159,6 +8160,12 @@ class Videos extends APIResource {
     delete(videoID, options) {
         return this._client.delete(path `/videos/${videoID}`, options);
     }
+    /**
+     * Create a character from an uploaded video.
+     */
+    createCharacter(body, options) {
+        return this._client.post('/videos/characters', multipartFormRequestOptions({ body, ...options }, this._client));
+    }
     /**
      * Download the generated video bytes or a derived preview asset.
      *
@@ -8172,6 +8179,25 @@ class Videos extends APIResource {
             __binaryResponse: true,
         });
     }
+    /**
+     * Create a new video generation job by editing a source video or existing
+     * generated video.
+     */
+    edit(body, options) {
+        return this._client.post('/videos/edits', multipartFormRequestOptions({ body, ...options }, this._client));
+    }
+    /**
+     * Create an extension of a completed video.
+     */
+    extend(body, options) {
+        return this._client.post('/videos/extensions', multipartFormRequestOptions({ body, ...options }, this._client));
+    }
+    /**
+     * Fetch a character.
+     */
+    getCharacter(characterID, options) {
+        return this._client.get(path `/videos/characters/${characterID}`, options);
+    }
     /**
      * Create a remix of a completed video using a refreshed prompt.
      */
@@ -8453,8 +8479,9 @@ class OpenAI {
             new URL(path)
             : new URL(baseURL + (baseURL.endsWith('/') && path.startsWith('/') ? path.slice(1) : path));
         const defaultQuery = this.defaultQuery();
-        if (!isEmptyObj$1(defaultQuery)) {
-            query = { ...defaultQuery, ...query };
+        const pathQuery = Object.fromEntries(url.searchParams);
+        if (!isEmptyObj$1(defaultQuery) || !isEmptyObj$1(pathQuery)) {
+            query = { ...pathQuery, ...defaultQuery, ...query };
         }
         if (typeof query === 'object' && query && !Array.isArray(query)) {
             url.search = this.stringifyQuery(query);
@@ -11674,6 +11701,11 @@ const openAiModelCosts = {
         cacheHitCost: 0.025 / 1_000_000,
         outputCost: 2 / 1_000_000,
     },
+    'gpt-5.4-mini': {
+        inputCost: 0.25 / 1_000_000,
+        cacheHitCost: 0.025 / 1_000_000,
+        outputCost: 2 / 1_000_000,
+    },
     'gpt-5-nano': {
         inputCost: 0.05 / 1_000_000,
         cacheHitCost: 0.005 / 1_000_000,
@@ -12184,6 +12216,7 @@ const isSupportedModel = (model) => {
         'gpt-4.1-nano',
         'gpt-5',
         'gpt-5-mini',
+        'gpt-5.4-mini',
         'gpt-5-nano',
         'gpt-5.1',
         'gpt-5.4',
@@ -12212,6 +12245,7 @@ function supportsTemperature(model) {
         'o3',
         'gpt-5',
         'gpt-5-mini',
+        'gpt-5.4-mini',
         'gpt-5-nano',
         'gpt-5.1',
         'gpt-5.4',
@@ -12241,6 +12275,7 @@ function isGPT5Model(model) {
     const gpt5Models = [
         'gpt-5',
         'gpt-5-mini',
+        'gpt-5.4-mini',
         'gpt-5-nano',
         'gpt-5.1',
         'gpt-5.4',
@@ -12550,6 +12585,7 @@ const MULTIMODAL_VISION_MODELS = new Set([
     'gpt-4o',
     'gpt-5',
     'gpt-5-mini',
+    'gpt-5.4-mini',
     'gpt-5-nano',
     'gpt-5.1',
     'gpt-5.4',
@@ -19037,7 +19073,7 @@ class AlpacaMarketDataAPI extends EventEmitter {
      */
     async getHistoricalBars(params) {
         const symbols = params.symbols;
-        symbols.join(',');
+        const symbolsStr = symbols.join(',');
         let allBars = {};
         let pageToken = null;
         let hasMorePages = true;
@@ -19048,7 +19084,7 @@ class AlpacaMarketDataAPI extends EventEmitter {
         symbols.forEach((symbol) => {
             allBars[symbol] = [];
         });
-        log(`Starting historical bars fetch for ${symbols.length} symbols (${params.timeframe}, ${params.start || 'no start'} to ${params.end || 'no end'})`);
+        log(`Starting ${params.timeframe}bars fetch for ${symbols.length} symbols (${symbolsStr}), ${params.start || 'no start'} to ${params.end || 'no end'})`, { symbol: symbolsStr });
         while (hasMorePages) {
             pageCount++;
             const requestParams = {
@@ -19059,7 +19095,7 @@ class AlpacaMarketDataAPI extends EventEmitter {
             };
             const response = await this.makeRequest('/stocks/bars', 'GET', requestParams);
             if (!response.bars) {
-                log(`No bars data found in response for ${symbols.length} symbols`, { type: 'warn' });
+                log(`No bars data found in response for ${symbols.length} symbols`, { symbol: symbolsStr, type: 'warn' });
                 break;
             }
             // Track currency from first response
@@ -19093,7 +19129,7 @@ class AlpacaMarketDataAPI extends EventEmitter {
             const dateRangeStr = earliestTimestamp && latestTimestamp
                 ? `${new Date(earliestTimestamp).toLocaleDateString('en-US', { timeZone: 'America/New_York' })} to ${new Date(latestTimestamp).toLocaleDateString('en-US', { timeZone: 'America/New_York' })}`
                 : 'unknown range';
-            log(`Page ${pageCount}: Fetched ${pageBarsCount.toLocaleString()} bars (total: ${totalBarsCount.toLocaleString()}) for ${symbols.length} symbols, date range: ${dateRangeStr}${hasMorePages ? ', more pages available' : ', complete'}`, { type: 'debug' });
+            log(`Page ${pageCount}: Fetched ${pageBarsCount.toLocaleString()} bars (total: ${totalBarsCount.toLocaleString()}) for ${symbols.length} symbols, date range: ${dateRangeStr}${hasMorePages ? ', more pages available' : ', complete'}`, { symbol: symbolsStr, type: 'debug' });
             // Prevent infinite loops
             if (pageCount > 1000) {
                 log(`Stopping pagination after ${pageCount} pages to prevent infinite loop`, { type: 'warn' });
@@ -19104,7 +19140,7 @@ class AlpacaMarketDataAPI extends EventEmitter {
         const symbolCounts = Object.entries(allBars)
             .map(([symbol, bars]) => `${symbol}: ${bars.length}`)
             .join(', ');
-        log(`Bars fetch complete: ${totalBarsCount.toLocaleString()} total bars across ${pageCount} pages for ${symbols.length} symbols (${symbolCounts})`);
+        log(`${params.timeframe} bars fetch complete: ${totalBarsCount.toLocaleString()} total bars across ${pageCount} pages for ${symbols.length} symbols (${symbolCounts})`, { symbol: symbolsStr });
         return {
             bars: allBars,
             next_page_token: null, // Always null since we fetch all pages
@@ -19956,6 +19992,26 @@ class AlpacaMarketDataAPI extends EventEmitter {
 const marketDataAPI = AlpacaMarketDataAPI.getInstance();
 
 const limitPriceSlippagePercent100 = 0.1; // 0.1%
+class AlpacaRequestError extends Error {
+    method;
+    status;
+    url;
+    responseCode;
+    responseDetails;
+    rawResponse;
+    symbol;
+    constructor(params) {
+        super(params.message);
+        this.name = 'AlpacaRequestError';
+        this.method = params.method;
+        this.status = params.status ?? null;
+        this.url = params.url;
+        this.responseCode = params.responseCode ?? null;
+        this.responseDetails = params.responseDetails ?? null;
+        this.rawResponse = params.rawResponse ?? null;
+        this.symbol = params.symbol;
+    }
+}
 /**
 Websocket example
   const alpacaAPI = createAlpacaTradingAPI(credentials); // type AlpacaCredentials
@@ -20039,6 +20095,75 @@ class AlpacaTradingAPI {
     roundPriceForAlpaca = (price) => {
         return price >= 1 ? Math.round(price * 100) / 100 : Math.round(price * 10000) / 10000;
     };
+    isJsonObject(value) {
+        return value !== null && !Array.isArray(value) && typeof value === 'object';
+    }
+    parseAlpacaAPIErrorResponse(rawResponse) {
+        if (rawResponse.trim() === '') {
+            return null;
+        }
+        try {
+            const parsedValue = JSON.parse(rawResponse);
+            if (!this.isJsonObject(parsedValue)) {
+                return null;
+            }
+            const code = parsedValue['code'];
+            const message = parsedValue['message'];
+            const symbol = parsedValue['symbol'];
+            if (typeof code !== 'number' || typeof message !== 'string') {
+                return null;
+            }
+            if (symbol !== undefined && typeof symbol !== 'string') {
+                return null;
+            }
+            return parsedValue;
+        }
+        catch {
+            return null;
+        }
+    }
+    formatJsonValueForLog(value) {
+        if (value === undefined) {
+            return 'undefined';
+        }
+        if (Array.isArray(value)) {
+            return value.map((entry) => this.formatJsonValueForLog(entry)).join(', ');
+        }
+        if (value === null) {
+            return 'null';
+        }
+        if (typeof value === 'object') {
+            return JSON.stringify(value);
+        }
+        return `${value}`;
+    }
+    formatAlpacaAPIErrorDetails(errorResponse) {
+        return Object.entries(errorResponse)
+            .filter(([key]) => key !== 'code' && key !== 'message' && key !== 'symbol')
+            .map(([key, value]) => `${key}=${this.formatJsonValueForLog(value)}`)
+            .join(', ');
+    }
+    formatRequestAction(requestContext) {
+        return requestContext?.action ? `${requestContext.action} failed` : 'Alpaca request failed';
+    }
+    buildAlpacaAPIErrorMessage(params) {
+        const { requestContext, status, url, errorResponse, rawResponse } = params;
+        const action = this.formatRequestAction(requestContext);
+        const message = errorResponse?.message ?? (rawResponse || 'No error body returned');
+        const responseCode = errorResponse?.code ? ` (code ${errorResponse.code})` : '';
+        const detailSummary = errorResponse ? this.formatAlpacaAPIErrorDetails(errorResponse) : '';
+        const detailText = detailSummary !== ''
+            ? ` Details: ${detailSummary}.`
+            : rawResponse.trim() !== '' && errorResponse === null
+                ? ` Response: ${rawResponse}.`
+                : '';
+        return `${action}: Alpaca API ${status}${responseCode}: ${message}.${detailText} Url: ${url}`;
+    }
+    buildRequestExecutionErrorMessage(params) {
+        const { requestContext, url, errorMessage } = params;
+        const action = this.formatRequestAction(requestContext);
+        return `${action}: ${errorMessage}. Url: ${url}`;
+    }
     handleAuthMessage(data) {
         if (data.status === 'authorized') {
             this.authenticated = true;
@@ -20266,7 +20391,7 @@ class AlpacaTradingAPI {
             this.ws?.on('message', handleListenResponse);
         });
     }
-    async makeRequest(endpoint, method = 'GET', body, queryString = '') {
+    async makeRequest(endpoint, method = 'GET', body, queryString = '', requestContext) {
         const url = `${this.apiBaseUrl}${endpoint}${queryString}`;
         try {
             const response = await fetch(url, {
@@ -20275,9 +20400,27 @@ class AlpacaTradingAPI {
                 body: body ? JSON.stringify(body) : undefined,
             });
             if (!response.ok) {
-                const errorText = await response.text();
-                this.log(`Alpaca API error (${response.status}): ${errorText}`, { type: 'error' });
-                throw new Error(`Alpaca API error (${response.status}): ${errorText}`);
+                const rawResponse = await response.text();
+                const errorResponse = this.parseAlpacaAPIErrorResponse(rawResponse);
+                const symbol = requestContext?.symbol ?? errorResponse?.symbol;
+                const error = new AlpacaRequestError({
+                    message: this.buildAlpacaAPIErrorMessage({
+                        requestContext,
+                        status: response.status,
+                        url,
+                        errorResponse,
+                        rawResponse,
+                    }),
+                    method,
+                    status: response.status,
+                    url,
+                    responseCode: errorResponse?.code ?? null,
+                    responseDetails: errorResponse,
+                    rawResponse,
+                    symbol,
+                });
+                this.log(error.message, { symbol, type: 'error' });
+                throw error;
             }
             // Handle responses with no content (e.g., 204 No Content)
             if (response.status === 204 || response.headers.get('content-length') === '0') {
@@ -20285,23 +20428,37 @@ class AlpacaTradingAPI {
             }
             const contentType = response.headers.get('content-type');
             if (contentType && contentType.includes('application/json')) {
-                return await response.json();
+                return (await response.json());
             }
             // For non-JSON responses, return the text content
             const textContent = await response.text();
-            return textContent || null;
+            return (textContent || null);
         }
-        catch (err) {
-            const error = err;
-            this.log(`Error in makeRequest: ${error.message}. Url: ${url}`, {
-                source: 'AlpacaAPI',
-                type: 'error',
+        catch (error) {
+            if (error instanceof AlpacaRequestError) {
+                throw error;
+            }
+            const normalizedError = error instanceof Error ? error : new Error(`${error}`);
+            const symbol = requestContext?.symbol;
+            const requestError = new AlpacaRequestError({
+                message: this.buildRequestExecutionErrorMessage({
+                    requestContext,
+                    url,
+                    errorMessage: normalizedError.message,
+                }),
+                method,
+                url,
+                rawResponse: null,
+                symbol,
             });
-            throw error;
+            this.log(requestError.message, { symbol, type: 'error' });
+            throw requestError;
         }
     }
     async getPositions(assetClass) {
-        const positions = (await this.makeRequest('/positions'));
+        const positions = await this.makeRequest('/positions', 'GET', undefined, '', {
+            action: 'Get positions',
+        });
         if (assetClass) {
             return positions.filter((position) => position.asset_class === assetClass);
         }
@@ -20339,22 +20496,15 @@ class AlpacaTradingAPI {
         if (params.side)
             queryParams.append('side', params.side);
         const endpoint = `/orders${queryParams.toString() ? `?${queryParams.toString()}` : ''}`;
-        try {
-            return await this.makeRequest(endpoint);
-        }
-        catch (error) {
-            this.log(`Error getting orders: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest(endpoint, 'GET', undefined, '', {
+            action: 'Get orders',
+            symbol: params.symbols?.join(','),
+        });
     }
     async getAccountDetails() {
-        try {
-            return await this.makeRequest('/account');
-        }
-        catch (error) {
-            this.log(`Error getting account details: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest('/account', 'GET', undefined, '', {
+            action: 'Get account details',
+        });
     }
     /**
      * Create a trailing stop order
@@ -20372,27 +20522,21 @@ class AlpacaTradingAPI {
         });
         const body = {
             symbol,
-            qty: Math.abs(qty),
+            qty: Math.abs(qty).toString(),
             side,
             position_intent,
             order_class: 'simple',
             type: 'trailing_stop',
-            trail_percent: trailPercent100, // Already in decimal form (e.g., 4 for 4%)
+            trail_percent: trailPercent100.toString(),
             time_in_force: 'gtc',
         };
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest(`/orders`, 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating trailing stop: ${error}`, {
-                symbol,
-                type: 'error',
-            });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create trailing stop order',
+            symbol,
+        });
     }
     /**
      * Create a stop order (stop or stop-limit)
@@ -20418,25 +20562,19 @@ class AlpacaTradingAPI {
             position_intent,
             order_class: 'simple',
             type: isStopLimit ? 'stop_limit' : 'stop',
-            stop_price: this.roundPriceForAlpaca(stopPrice),
+            stop_price: this.roundPriceForAlpaca(stopPrice).toString(),
             time_in_force: 'gtc',
         };
-        if (isStopLimit) {
-            body.limit_price = this.roundPriceForAlpaca(limitPrice);
+        if (limitPrice !== undefined) {
+            body.limit_price = this.roundPriceForAlpaca(limitPrice).toString();
         }
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest(`/orders`, 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating ${orderType} order: ${error}`, {
-                symbol,
-                type: 'error',
-            });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: `Create ${orderType} order`,
+            symbol,
+        });
     }
     /**
      * Create a market order
@@ -20462,13 +20600,10 @@ class AlpacaTradingAPI {
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest('/orders', 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating market order: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create market order',
+            symbol,
+        });
     }
     /**
      * Create a Market on Open (MOO) order - executes in the opening auction
@@ -20502,13 +20637,10 @@ class AlpacaTradingAPI {
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest('/orders', 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating MOO order: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create market on open order',
+            symbol,
+        });
     }
     /**
      * Create a Market on Close (MOC) order - executes in the closing auction
@@ -20542,13 +20674,10 @@ class AlpacaTradingAPI {
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest('/orders', 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating MOC order: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create market on close order',
+            symbol,
+        });
     }
     /**
      * Create an OCO (One-Cancels-Other) order with take profit and stop loss
@@ -20574,32 +20703,29 @@ class AlpacaTradingAPI {
             position_intent,
             order_class: 'oco',
             type: 'limit',
-            limit_price: this.roundPriceForAlpaca(limitPrice),
+            limit_price: this.roundPriceForAlpaca(limitPrice).toString(),
             time_in_force: 'gtc',
             take_profit: {
-                limit_price: this.roundPriceForAlpaca(takeProfitPrice),
+                limit_price: this.roundPriceForAlpaca(takeProfitPrice).toString(),
             },
             stop_loss: {
-                stop_price: this.roundPriceForAlpaca(stopLossPrice),
+                stop_price: this.roundPriceForAlpaca(stopLossPrice).toString(),
             },
         };
         // If stop loss limit price is provided, create stop-limit order
         if (stopLossLimitPrice !== undefined) {
-            body.stop_loss.limit_price = this.roundPriceForAlpaca(stopLossLimitPrice);
+            body.stop_loss = {
+                stop_price: this.roundPriceForAlpaca(stopLossPrice).toString(),
+                limit_price: this.roundPriceForAlpaca(stopLossLimitPrice).toString(),
+            };
         }
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest(`/orders`, 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating OCO order: ${error}`, {
-                symbol,
-                type: 'error',
-            });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create OCO order',
+            symbol,
+        });
     }
     /**
      * Get the current trail percent for a symbol, assuming that it has an open position and a trailing stop order to close it. Because this relies on an orders request for one symbol, you can't do it too often.
@@ -20607,35 +20733,26 @@ class AlpacaTradingAPI {
      * @returns the current trail percent
      */
     async getCurrentTrailPercent(symbol) {
-        try {
-            const orders = await this.getOrders({
-                status: 'open',
-                symbols: [symbol],
+        const orders = await this.getOrders({
+            status: 'open',
+            symbols: [symbol],
+        });
+        const trailingStopOrder = orders.find((order) => order.type === 'trailing_stop' &&
+            (order.position_intent === 'sell_to_close' || order.position_intent === 'buy_to_close'));
+        if (!trailingStopOrder) {
+            this.log(`No closing trailing stop order found for ${symbol}`, {
+                symbol,
             });
-            const trailingStopOrder = orders.find((order) => order.type === 'trailing_stop' &&
-                (order.position_intent === 'sell_to_close' || order.position_intent === 'buy_to_close'));
-            if (!trailingStopOrder) {
-                this.log(`No closing trailing stop order found for ${symbol}`, {
-                    symbol,
-                });
-                return null;
-            }
-            if (!trailingStopOrder.trail_percent) {
-                this.log(`Trailing stop order found for ${symbol} but no trail_percent value`, {
-                    symbol,
-                });
-                return null;
-            }
-            const trailPercent = parseFloat(trailingStopOrder.trail_percent);
-            return trailPercent;
+            return null;
         }
-        catch (error) {
-            this.log(`Error getting current trail percent: ${error}`, {
+        if (!trailingStopOrder.trail_percent) {
+            this.log(`Trailing stop order found for ${symbol} but no trail_percent value`, {
                 symbol,
-                type: 'error',
             });
-            throw error;
+            return null;
         }
+        const trailPercent = parseFloat(trailingStopOrder.trail_percent);
+        return trailPercent;
     }
     /**
      * Update the trail percent for a trailing stop order
@@ -20667,18 +20784,10 @@ class AlpacaTradingAPI {
         this.log(`Updating trailing stop for ${symbol} from ${currentTrailPercent}% to ${trailPercent100}%`, {
             symbol,
         });
-        try {
-            await this.makeRequest(`/orders/${trailingStopOrder.id}`, 'PATCH', {
-                trail: trailPercent100.toString(), // Changed from trail_percent to trail
-            });
-        }
-        catch (error) {
-            this.log(`Error updating trailing stop: ${error}`, {
-                symbol,
-                type: 'error',
-            });
-            throw error;
-        }
+        await this.makeRequest(`/orders/${trailingStopOrder.id}`, 'PATCH', { trail: trailPercent100.toString() }, '', {
+            action: 'Update trailing stop order',
+            symbol,
+        });
     }
     /**
      * Cancel all open orders
@@ -20686,10 +20795,16 @@ class AlpacaTradingAPI {
     async cancelAllOrders() {
         this.log(`Canceling all open orders`);
         try {
-            await this.makeRequest('/orders', 'DELETE');
+            await this.makeRequest('/orders', 'DELETE', undefined, '', {
+                action: 'Cancel all open orders',
+            });
         }
         catch (error) {
-            this.log(`Error canceling all orders: ${error}`, { type: 'error' });
+            if (!(error instanceof AlpacaRequestError)) {
+                this.log(`Error canceling all orders: ${error instanceof Error ? error.message : `${error}`}`, {
+                    type: 'error',
+                });
+            }
         }
     }
     /**
@@ -20701,15 +20816,14 @@ class AlpacaTradingAPI {
     async cancelOrder(orderId) {
         this.log(`Attempting to cancel order ${orderId}`);
         try {
-            await this.makeRequest(`/orders/${orderId}`, 'DELETE');
+            await this.makeRequest(`/orders/${orderId}`, 'DELETE', undefined, '', {
+                action: `Cancel order ${orderId}`,
+            });
             this.log(`Successfully canceled order ${orderId}`);
         }
         catch (error) {
             // If the error is a 422, it means the order is not cancelable
-            if (error instanceof Error && error.message.includes('422')) {
-                this.log(`Order ${orderId} is not cancelable`, {
-                    type: 'error',
-                });
+            if (error instanceof AlpacaRequestError && error.status === 422) {
                 throw new Error(`Order ${orderId} is not cancelable`);
             }
             // Re-throw other errors
@@ -20744,13 +20858,10 @@ class AlpacaTradingAPI {
         if (client_order_id !== undefined) {
             body.client_order_id = client_order_id;
         }
-        try {
-            return await this.makeRequest('/orders', 'POST', body);
-        }
-        catch (error) {
-            this.log(`Error creating limit order: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', body, '', {
+            action: 'Create limit order',
+            symbol,
+        });
     }
     /**
      * Close all equities positions
@@ -20816,7 +20927,9 @@ class AlpacaTradingAPI {
             }
         }
         else {
-            await this.makeRequest('/positions', 'DELETE', undefined, options.cancel_orders ? '?cancel_orders=true' : '');
+            await this.makeRequest('/positions', 'DELETE', undefined, options.cancel_orders ? '?cancel_orders=true' : '', {
+                action: 'Close all positions',
+            });
         }
     }
     /**
@@ -20895,7 +21008,9 @@ class AlpacaTradingAPI {
             queryParams.append('end', params.end);
         if (params.date_end)
             queryParams.append('date_end', params.date_end);
-        const response = await this.makeRequest(`/account/portfolio/history?${queryParams.toString()}`);
+        const response = await this.makeRequest(`/account/portfolio/history?${queryParams.toString()}`, 'GET', undefined, '', {
+            action: 'Get portfolio history',
+        });
         return response;
     }
     /**
@@ -20986,7 +21101,10 @@ class AlpacaTradingAPI {
         this.log(`Fetching option contracts for ${params.underlying_symbols.join(', ')}`, {
             symbol: params.underlying_symbols.join(', '),
         });
-        const response = (await this.makeRequest(`/options/contracts?${queryParams.toString()}`));
+        const response = await this.makeRequest(`/options/contracts?${queryParams.toString()}`, 'GET', undefined, '', {
+            action: 'Get option contracts',
+            symbol: params.underlying_symbols.join(', '),
+        });
         this.log(`Found ${response.option_contracts.length} option contracts`, {
             symbol: params.underlying_symbols.join(', '),
         });
@@ -21001,7 +21119,10 @@ class AlpacaTradingAPI {
         this.log(`Fetching option contract details for ${symbolOrId}`, {
             symbol: symbolOrId,
         });
-        const response = (await this.makeRequest(`/options/contracts/${symbolOrId}`));
+        const response = await this.makeRequest(`/options/contracts/${symbolOrId}`, 'GET', undefined, '', {
+            action: 'Get option contract details',
+            symbol: symbolOrId,
+        });
         this.log(`Found option contract details for ${symbolOrId}: ${response.name}`, {
             symbol: symbolOrId,
         });
@@ -21019,10 +21140,10 @@ class AlpacaTradingAPI {
      */
     async createOptionOrder(symbol, qty, side, position_intent, type, limitPrice) {
         if (!Number.isInteger(qty) || qty <= 0) {
-            this.log('Quantity must be a positive whole number for option orders', { type: 'error' });
+            this.log('Quantity must be a positive whole number for option orders', { symbol, type: 'error' });
         }
         if (type === 'limit' && limitPrice === undefined) {
-            this.log('Limit price is required for limit orders', { type: 'error' });
+            this.log('Limit price is required for limit orders', { symbol, type: 'error' });
         }
         this.log(`Creating ${type} option order for ${symbol}: ${side} ${qty} contracts (${position_intent})${type === 'limit' ? ` at $${limitPrice?.toFixed(2)}` : ''}`, {
             symbol,
@@ -21040,7 +21161,10 @@ class AlpacaTradingAPI {
         if (type === 'limit' && limitPrice !== undefined) {
             orderData.limit_price = this.roundPriceForAlpaca(limitPrice).toString();
         }
-        return this.makeRequest('/orders', 'POST', orderData);
+        return this.makeRequest('/orders', 'POST', orderData, '', {
+            action: 'Create option order',
+            symbol,
+        });
     }
     /**
      * Create a multi-leg option order
@@ -21051,16 +21175,19 @@ class AlpacaTradingAPI {
      * @returns The created multi-leg order
      */
     async createMultiLegOptionOrder(legs, qty, type, limitPrice) {
+        const legSymbols = legs.map((leg) => leg.symbol).join(', ');
         if (!Number.isInteger(qty) || qty <= 0) {
-            this.log('Quantity must be a positive whole number for option orders', { type: 'error' });
+            this.log('Quantity must be a positive whole number for option orders', {
+                symbol: legSymbols,
+                type: 'error',
+            });
         }
         if (type === 'limit' && limitPrice === undefined) {
-            this.log('Limit price is required for limit orders', { type: 'error' });
+            this.log('Limit price is required for limit orders', { symbol: legSymbols, type: 'error' });
         }
         if (legs.length < 2) {
-            this.log('Multi-leg orders require at least 2 legs', { type: 'error' });
+            this.log('Multi-leg orders require at least 2 legs', { symbol: legSymbols, type: 'error' });
         }
-        const legSymbols = legs.map((leg) => leg.symbol).join(', ');
         this.log(`Creating multi-leg ${type} option order with ${legs.length} legs (${legSymbols})${type === 'limit' ? ` at $${limitPrice?.toFixed(2)}` : ''}`, {
             symbol: legSymbols,
         });
@@ -21074,7 +21201,10 @@ class AlpacaTradingAPI {
         if (type === 'limit' && limitPrice !== undefined) {
             orderData.limit_price = this.roundPriceForAlpaca(limitPrice).toString();
         }
-        return this.makeRequest('/orders', 'POST', orderData);
+        return this.makeRequest('/orders', 'POST', orderData, '', {
+            action: 'Create multi-leg option order',
+            symbol: legSymbols,
+        });
     }
     /**
      * Exercise an option contract
@@ -21085,7 +21215,10 @@ class AlpacaTradingAPI {
         this.log(`Exercising option contract ${symbolOrContractId}`, {
             symbol: symbolOrContractId,
         });
-        return this.makeRequest(`/positions/${symbolOrContractId}/exercise`, 'POST');
+        return this.makeRequest(`/positions/${symbolOrContractId}/exercise`, 'POST', undefined, '', {
+            action: 'Exercise option contract',
+            symbol: symbolOrContractId,
+        });
     }
     /**
      * Get option positions
@@ -21121,7 +21254,9 @@ class AlpacaTradingAPI {
             queryParams.append('date', date);
         }
         this.log(`Fetching option activities${activityType ? ` of type ${activityType}` : ''}${date ? ` for date ${date}` : ''}`);
-        return this.makeRequest(`/account/activities?${queryParams.toString()}`);
+        return this.makeRequest(`/account/activities?${queryParams.toString()}`, 'GET', undefined, '', {
+            action: 'Get option activities',
+        });
     }
     /**
      * Create a long call spread (buy lower strike call, sell higher strike call)
@@ -21219,13 +21354,7 @@ class AlpacaTradingAPI {
                 position_intent: 'buy_to_open',
             },
         ];
-        try {
-            return await this.createMultiLegOptionOrder(legs, qty, 'limit', limitPrice);
-        }
-        catch (error) {
-            this.log(`Error creating iron condor: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.createMultiLegOptionOrder(legs, qty, 'limit', limitPrice);
     }
     /**
      * Create a covered call (sell call option against owned stock)
@@ -21241,13 +21370,7 @@ class AlpacaTradingAPI {
         });
         // For covered calls, we don't need to include the stock leg if we already own the shares
         // We just create a simple sell order for the call option
-        try {
-            return await this.createOptionOrder(callOptionSymbol, qty, 'sell', 'sell_to_open', 'limit', limitPrice);
-        }
-        catch (error) {
-            this.log(`Error creating covered call: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.createOptionOrder(callOptionSymbol, qty, 'sell', 'sell_to_open', 'limit', limitPrice);
     }
     /**
      * Roll an option position to a new expiration or strike
@@ -21282,13 +21405,7 @@ class AlpacaTradingAPI {
                 position_intent: openPositionIntent,
             },
         ];
-        try {
-            return await this.createMultiLegOptionOrder(legs, qty, 'limit', limitPrice);
-        }
-        catch (error) {
-            this.log(`Error rolling option position: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.createMultiLegOptionOrder(legs, qty, 'limit', limitPrice);
     }
     /**
      * Get option chain for a specific underlying symbol and expiration date
@@ -21312,10 +21429,12 @@ class AlpacaTradingAPI {
             return response.option_contracts || [];
         }
         catch (error) {
-            this.log(`Failed to fetch option chain for ${underlyingSymbol}: ${error instanceof Error ? error.message : 'Unknown error'}`, {
-                type: 'error',
-                symbol: underlyingSymbol,
-            });
+            if (!(error instanceof AlpacaRequestError)) {
+                this.log(`Failed to fetch option chain for ${underlyingSymbol}: ${error instanceof Error ? error.message : `${error}`}`, {
+                    type: 'error',
+                    symbol: underlyingSymbol,
+                });
+            }
             return [];
         }
     }
@@ -21346,10 +21465,12 @@ class AlpacaTradingAPI {
             return Array.from(expirationDates).sort();
         }
         catch (error) {
-            this.log(`Failed to fetch expiration dates for ${underlyingSymbol}: ${error instanceof Error ? error.message : 'Unknown error'}`, {
-                type: 'error',
-                symbol: underlyingSymbol,
-            });
+            if (!(error instanceof AlpacaRequestError)) {
+                this.log(`Failed to fetch expiration dates for ${underlyingSymbol}: ${error instanceof Error ? error.message : `${error}`}`, {
+                    type: 'error',
+                    symbol: underlyingSymbol,
+                });
+            }
             return [];
         }
     }
@@ -21408,7 +21529,10 @@ class AlpacaTradingAPI {
                 this.log(`Canceling open order for ${order.symbol}`, {
                     symbol: order.symbol,
                 });
-                await this.makeRequest(`/orders/${order.id}`, 'DELETE');
+                await this.makeRequest(`/orders/${order.id}`, 'DELETE', undefined, '', {
+                    action: `Cancel option order ${order.id}`,
+                    symbol: order.symbol,
+                });
             }
         }
     }
@@ -21431,13 +21555,7 @@ class AlpacaTradingAPI {
         const quantityToClose = qty || parseInt(position.qty);
         const side = position.side === 'long' ? 'sell' : 'buy';
         const positionIntent = side === 'sell' ? 'sell_to_close' : 'buy_to_close';
-        try {
-            return await this.createOptionOrder(symbol, quantityToClose, side, positionIntent, 'market');
-        }
-        catch (error) {
-            this.log(`Error closing option position: ${error}`, { type: 'error' });
-            throw error;
-        }
+        return this.createOptionOrder(symbol, quantityToClose, side, positionIntent, 'market');
     }
     /**
      * Create a complete equities trade with optional stop loss and take profit
@@ -21572,16 +21690,10 @@ class AlpacaTradingAPI {
         this.log(logMessage, {
             symbol,
         });
-        try {
-            return await this.makeRequest('/orders', 'POST', orderData);
-        }
-        catch (error) {
-            this.log(`Error creating equities trade: ${error}`, {
-                symbol,
-                type: 'error',
-            });
-            throw error;
-        }
+        return this.makeRequest('/orders', 'POST', orderData, '', {
+            action: 'Create equities trade',
+            symbol,
+        });
     }
 }