@huskly/ibkr-client 0.13.0 → 0.15.0

package/dist/ibkr/ibkrClient.js

@@ -74,6 +74,7 @@ const IBKR_WORKING_STATUSES = new Set([
     "SUBMITTED",
     "PENDING_CANCEL",
 ]);
+const RECOVERY_TERMINAL_ORDER_FILTERS = ["filled", "cancelled", "inactive"];
 const KNOWN_ORDER_WARNING_IDS = new Set(["o163"]);
 /** Extract the canonical OSI symbol embedded in an IBKR option description. */
 function extractOsiPositionSymbol(contractDescription) {
@@ -100,6 +101,17 @@ function isHeadersLike(input) {
         input !== null &&
         typeof input.get === "function");
 }
+function isIbkrTrade(input) {
+    if (typeof input !== "object" || input === null || Array.isArray(input))
+        return false;
+    const record = input;
+    return ((record["account"] === undefined || typeof record["account"] === "string") &&
+        (record["accountCode"] === undefined || typeof record["accountCode"] === "string") &&
+        (record["order_ref"] === undefined || typeof record["order_ref"] === "string") &&
+        (record["order_id"] === undefined ||
+            typeof record["order_id"] === "string" ||
+            typeof record["order_id"] === "number"));
+}
 function headerToString(value) {
     if (value === undefined || value === null)
         return undefined;
@@ -336,6 +348,532 @@ export class IbkrClient {
         });
         return this.normalizeMultiOrderSubmission(response, parent.clientOrderId);
     }
+    async submitDerivativeOrderGraph(request) {
+        this.validateOrderGraph(request);
+        const diagnostics = await this.getTradingDiagnostics(request.accountId);
+        if (!diagnostics.authenticated || diagnostics.competingSession) {
+            throw new Error("IBKR brokerage session is not safely authenticated for submission");
+        }
+        await this.prepareBrokerageAccount(request.accountId);
+        const response = await this.singleAttemptRequest({
+            path: `iserver/account/${request.accountId}/orders`,
+            method: "POST",
+            data: { orders: request.nodes.map((node) => this.graphOrderTicket(request, node)) },
+        });
+        return this.normalizeOrderGraphSubmission(response, request, []);
+    }
+    async acknowledgeDerivativeOrderGraphWarning(input) {
+        if (input.confirmed !== true)
+            throw new Error("Order warning confirmation must be true");
+        this.validateOrderGraph(input.continuation.request);
+        if (!input.continuation.replyId.trim())
+            throw new Error("An exact warning reply ID is required");
+        const diagnostics = await this.getTradingDiagnostics(input.continuation.request.accountId);
+        if (!diagnostics.authenticated || diagnostics.competingSession) {
+            throw new Error("IBKR brokerage session is not safely authenticated for submission");
+        }
+        await this.prepareBrokerageAccount(input.continuation.request.accountId);
+        const response = await this.singleAttemptRequest({
+            path: `iserver/reply/${encodeURIComponent(input.continuation.replyId)}`,
+            method: "POST",
+            data: { confirmed: true },
+        });
+        return this.normalizeOrderGraphSubmission(response, input.continuation.request, input.continuation.members);
+    }
+    async recoverDerivativeOrderGraph(input, request) {
+        this.validateOrderGraph(request);
+        if (input.accountId !== request.accountId)
+            throw new Error("Graph recovery account does not match request");
+        if (input.rootClientOrderId !== undefined &&
+            input.rootClientOrderId !== request.rootClientOrderId) {
+            throw new Error("Root client order ID does not match the requested graph");
+        }
+        if (input.orderId !== undefined && !input.orderId.trim()) {
+            throw new Error("An exact broker order ID is required for graph recovery");
+        }
+        await this.prepareBrokerageAccount(input.accountId);
+        const response = await this.req({
+            path: "iserver/account/orders",
+            params: { force: true, accountId: input.accountId },
+        });
+        const flattenedActiveSnapshot = this.flattenCompleteOrderSnapshot(response);
+        const activeSnapshotIncomplete = flattenedActiveSnapshot === null;
+        const invalidActiveAccountEvidence = flattenedActiveSnapshot?.some(({ order }) => !this.orderHasExactAccount(order, input.accountId)) ?? false;
+        const invalidNestedActiveEvidence = flattenedActiveSnapshot?.some(({ order, nestedParent }) => nestedParent !== null &&
+            !this.recoveryGraphOrderMayBeAttached(request, order) &&
+            this.recoveryGraphOrderIsAttached(request, nestedParent)) ?? false;
+        const accountOrders = (flattenedActiveSnapshot ?? [])
+            .map(({ order }) => order)
+            .filter((order) => this.orderHasExactAccount(order, input.accountId));
+        const activeMatchesByMember = new Map();
+        const observedCandidates = activeSnapshotIncomplete || invalidActiveAccountEvidence || invalidNestedActiveEvidence
+            ? [response]
+            : [];
+        observedCandidates.push(...accountOrders.filter((order) => this.recoveryGraphOrderMayBeAttached(request, order)));
+        for (const node of request.nodes) {
+            const matches = accountOrders.filter((order) => this.terminalOrderTicketIsValid(order) &&
+                this.orderHasValidRecoveryStatus(order) &&
+                this.recoveryOrderMatchesGraphNode(request, node, order));
+            activeMatchesByMember.set(node.memberId, matches);
+        }
+        const selected = new Map();
+        const usedOrderIds = new Set();
+        for (const node of request.nodes) {
+            const matches = activeMatchesByMember.get(node.memberId) ?? [];
+            const [match] = matches;
+            if (matches.length !== 1 || match === undefined)
+                continue;
+            const orderId = this.recoveryOrderId(match);
+            if (orderId === undefined)
+                continue;
+            if (usedOrderIds.has(orderId))
+                continue;
+            usedOrderIds.add(orderId);
+            selected.set(node.memberId, match);
+        }
+        const unresolved = request.nodes.filter((node) => !selected.has(node.memberId));
+        const terminalEvidence = await this.findRecoveryGraphTerminalCandidates(input.accountId, request, input.orderId);
+        this.reconcileSelectedGraphMembers(request, selected, terminalEvidence);
+        if (unresolved.length > 0) {
+            const assignments = this.assignRecoveryGraphCandidates(unresolved, terminalEvidence.byNode, usedOrderIds);
+            for (const node of unresolved) {
+                const order = assignments.get(node.memberId);
+                if (order === undefined)
+                    continue;
+                selected.set(node.memberId, order);
+                const orderId = this.recoveryOrderId(order);
+                if (orderId !== undefined)
+                    usedOrderIds.add(orderId);
+                observedCandidates.push(order);
+            }
+        }
+        observedCandidates.push(...terminalEvidence.observedResponses);
+        if (terminalEvidence.invalidAttachedEvidence) {
+            observedCandidates.push({ reason: "Invalid or conflicting terminal broker evidence" });
+        }
+        const selectedCandidates = [...selected.values()];
+        const requestedOrderIdMissing = input.orderId !== undefined &&
+            !selectedCandidates.some((order) => this.recoveryOrderId(order) === input.orderId);
+        const members = request.nodes.map((node) => {
+            const order = selected.get(node.memberId);
+            return this.graphMemberEvidence(request, node, order);
+        });
+        const ids = members.flatMap(({ orderId }) => (orderId === null ? [] : [orderId]));
+        const hasDistinctOrderIds = new Set(ids).size === request.nodes.length;
+        const linkedOrderIds = new Set();
+        let linkedOrderMissingBrokerId = false;
+        for (const order of accountOrders) {
+            if (!this.recoveryGraphOrderMayBeAttached(request, order))
+                continue;
+            if (!this.recoveryGraphOrderIsAttached(request, order)) {
+                linkedOrderMissingBrokerId = true;
+                continue;
+            }
+            const orderId = this.recoveryOrderId(order);
+            if (orderId === undefined) {
+                linkedOrderMissingBrokerId = true;
+                continue;
+            }
+            linkedOrderIds.add(orderId);
+        }
+        for (const order of terminalEvidence.linkedOrders) {
+            const orderId = this.recoveryOrderId(order);
+            if (orderId === undefined) {
+                linkedOrderMissingBrokerId = true;
+                continue;
+            }
+            linkedOrderIds.add(orderId);
+        }
+        const selectedOrderIds = new Set(selectedCandidates.flatMap((order) => {
+            const orderId = this.recoveryOrderId(order);
+            return orderId === undefined ? [] : [orderId];
+        }));
+        if (selected.size !== request.nodes.length ||
+            !hasDistinctOrderIds ||
+            linkedOrderMissingBrokerId ||
+            [...linkedOrderIds].some((orderId) => !selectedOrderIds.has(orderId)) ||
+            requestedOrderIdMissing ||
+            activeSnapshotIncomplete ||
+            invalidActiveAccountEvidence ||
+            invalidNestedActiveEvidence ||
+            terminalEvidence.invalidAttachedEvidence ||
+            terminalEvidence.terminalSnapshotLookupFailed ||
+            members.some(({ status }) => status === "UNKNOWN" || status === "WARNING_PENDING")) {
+            return {
+                state: "recovery_required",
+                rootClientOrderId: request.rootClientOrderId,
+                members,
+                reasons: [
+                    "Exact graph recovery found incomplete, duplicated, or ambiguous member evidence",
+                ],
+                warnings: [],
+                errors: [],
+                unrecognizedResponses: observedCandidates,
+            };
+        }
+        return {
+            state: "accepted",
+            rootClientOrderId: request.rootClientOrderId,
+            members: this.attachGraphParentOrderIds(members),
+            warnings: [],
+        };
+    }
+    reconcileSelectedGraphMembers(request, selected, terminalEvidence) {
+        for (const node of request.nodes) {
+            const selectedOrder = selected.get(node.memberId);
+            const selectedOrderId = selectedOrder === undefined ? undefined : this.recoveryOrderId(selectedOrder);
+            if (selectedOrderId === undefined)
+                continue;
+            const terminalMatches = new Map();
+            for (const order of terminalEvidence.byNode.get(node.memberId) ?? []) {
+                const orderId = this.recoveryOrderId(order);
+                if (orderId === selectedOrderId)
+                    terminalMatches.set(orderId, order);
+            }
+            const terminalLinked = terminalMatches.size > 0 ||
+                terminalEvidence.linkedOrders.some((order) => this.recoveryOrderId(order) === selectedOrderId && this.isTerminalRecoveryOrder(order));
+            if (!terminalLinked)
+                continue;
+            if (terminalMatches.size !== 1) {
+                terminalEvidence.invalidAttachedEvidence = true;
+                continue;
+            }
+            const [terminalOrder] = terminalMatches.values();
+            if (terminalOrder !== undefined)
+                selected.set(node.memberId, terminalOrder);
+        }
+    }
+    isTerminalRecoveryOrder(order) {
+        const status = this.canonicalIbkrOrderStatus(order.order_status ?? order.orderStatus ?? order.status);
+        return (status === "FILLED" ||
+            status === "CANCELLED" ||
+            status === "INACTIVE" ||
+            status === "REJECTED");
+    }
+    async findRecoveryGraphTerminalCandidates(accountId, request, knownOrderId) {
+        const byNode = new Map();
+        for (const node of request.nodes)
+            byNode.set(node.memberId, []);
+        const linkedOrders = [];
+        const observedResponses = [];
+        let invalidAttachedEvidence = false;
+        let terminalSnapshotLookupFailed = false;
+        const candidateOrderIds = new Set();
+        if (knownOrderId !== undefined)
+            candidateOrderIds.add(knownOrderId);
+        const terminalOrdersById = new Map();
+        for (const filter of RECOVERY_TERMINAL_ORDER_FILTERS) {
+            try {
+                const response = await this.req({
+                    path: "iserver/account/orders",
+                    params: { force: true, accountId, filters: filter },
+                });
+                const flattenedSnapshot = this.flattenCompleteOrderSnapshot(response);
+                if (flattenedSnapshot === null) {
+                    terminalSnapshotLookupFailed = true;
+                    observedResponses.push({ source: "terminal_order_snapshot", filter, response });
+                    continue;
+                }
+                for (const { order, nestedParent } of flattenedSnapshot) {
+                    if (!this.recoveryGraphOrderMayBeAttached(request, order)) {
+                        if (nestedParent === null ||
+                            !this.recoveryGraphOrderIsAttached(request, nestedParent)) {
+                            continue;
+                        }
+                        observedResponses.push(order);
+                        linkedOrders.push(order);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    observedResponses.push(order);
+                    if (!this.recoveryGraphOrderIsAttached(request, order)) {
+                        linkedOrders.push(order);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    if (!this.orderHasExactAccount(order, accountId)) {
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    if (!this.terminalOrderTicketIsValid(order) || !this.orderHasValidRecoveryStatus(order)) {
+                        linkedOrders.push(order);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    const orderId = this.recoveryOrderId(order);
+                    if (orderId === undefined) {
+                        linkedOrders.push(order);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    const previousOrder = terminalOrdersById.get(orderId);
+                    if (previousOrder !== undefined &&
+                        (this.terminalOrderTicketConflicts(previousOrder, order) ||
+                            this.recoveryGraphAttachmentKey(request, previousOrder) !==
+                                this.recoveryGraphAttachmentKey(request, order))) {
+                        invalidAttachedEvidence = true;
+                        linkedOrders.push(order);
+                        continue;
+                    }
+                    terminalOrdersById.set(orderId, order);
+                    linkedOrders.push(order);
+                    candidateOrderIds.add(orderId);
+                }
+            }
+            catch (error) {
+                terminalSnapshotLookupFailed = true;
+                observedResponses.push({
+                    source: "terminal_order_snapshot",
+                    filter,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+        const tradeEvidenceById = new Map();
+        try {
+            const response = await this.req({
+                path: "iserver/account/trades",
+                params: { days: 7 },
+            });
+            if (Array.isArray(response)) {
+                for (const rawTrade of response) {
+                    if (typeof rawTrade !== "object" || rawTrade === null || Array.isArray(rawTrade))
+                        continue;
+                    const tradeRecord = rawTrade;
+                    const orderRef = this.trimmedString(tradeRecord["order_ref"]);
+                    const parentRef = this.recoveryOrderId({
+                        order_id: tradeRecord["parent_order_ref"],
+                        orderId: tradeRecord["parentOrderRef"],
+                    });
+                    if (orderRef !== request.rootClientOrderId && parentRef !== request.rootClientOrderId) {
+                        continue;
+                    }
+                    const accounts = [tradeRecord["account"], tradeRecord["accountCode"]].filter((value) => value !== undefined);
+                    if (accounts.length > 0 &&
+                        accounts.every((value) => typeof value === "string" && value !== accountId)) {
+                        continue;
+                    }
+                    if (accounts.length === 0 ||
+                        accounts.some((value) => typeof value !== "string" || value !== accountId) ||
+                        !isIbkrTrade(rawTrade)) {
+                        observedResponses.push(rawTrade);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    const orderId = this.recoveryOrderId(rawTrade);
+                    if (orderId === undefined) {
+                        observedResponses.push(rawTrade);
+                        invalidAttachedEvidence = true;
+                        continue;
+                    }
+                    candidateOrderIds.add(orderId);
+                    tradeEvidenceById.set(orderId, {
+                        ...rawTrade,
+                        account: accountId,
+                        order_id: orderId,
+                    });
+                }
+            }
+        }
+        catch {
+            // Exact broker IDs and terminal order snapshots remain usable when trade history is unavailable.
+        }
+        for (const orderId of candidateOrderIds) {
+            const terminalOrder = terminalOrdersById.get(orderId);
+            try {
+                const order = await this.req({
+                    path: `iserver/account/order/status/${encodeURIComponent(orderId)}`,
+                });
+                observedResponses.push(order);
+                if (!this.orderMatchesExactRecoveryIdentity(order, accountId, orderId)) {
+                    invalidAttachedEvidence = true;
+                    continue;
+                }
+                if (!this.orderHasValidRecoveryStatus(order)) {
+                    invalidAttachedEvidence = true;
+                    terminalOrdersById.delete(orderId);
+                    continue;
+                }
+                if (!this.terminalOrderTicketIsValid(order)) {
+                    invalidAttachedEvidence = true;
+                    terminalOrdersById.delete(orderId);
+                    continue;
+                }
+                if (terminalOrder !== undefined &&
+                    this.terminalOrderTicketConflicts(terminalOrder, order)) {
+                    invalidAttachedEvidence = true;
+                    terminalOrdersById.delete(orderId);
+                    continue;
+                }
+                if (terminalOrder !== undefined &&
+                    this.recoveryGraphAttachmentKey(request, terminalOrder) !==
+                        this.recoveryGraphAttachmentKey(request, order)) {
+                    invalidAttachedEvidence = true;
+                    terminalOrdersById.delete(orderId);
+                    continue;
+                }
+                if (!this.recoveryGraphOrderIsAttached(request, order)) {
+                    invalidAttachedEvidence = true;
+                    terminalOrdersById.delete(orderId);
+                    continue;
+                }
+                const resolvedOrder = terminalOrder === undefined ? order : { ...terminalOrder, ...order };
+                terminalOrdersById.set(orderId, resolvedOrder);
+                if (terminalOrder === undefined)
+                    linkedOrders.push(resolvedOrder);
+            }
+            catch (error) {
+                observedResponses.push({
+                    source: "terminal_order_status",
+                    orderId,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+                if (terminalOrder === undefined) {
+                    const tradeEvidence = tradeEvidenceById.get(orderId);
+                    if (tradeEvidence !== undefined) {
+                        linkedOrders.push(tradeEvidence);
+                        observedResponses.push(tradeEvidence);
+                    }
+                    continue;
+                }
+            }
+            const resolvedOrder = terminalOrdersById.get(orderId) ?? terminalOrder;
+            if (resolvedOrder === undefined)
+                continue;
+            if (!this.orderHasExactAccount(resolvedOrder, accountId)) {
+                invalidAttachedEvidence = true;
+                continue;
+            }
+            for (const node of request.nodes) {
+                if (this.terminalOrderMatchesGraphNode(request, node, resolvedOrder)) {
+                    const existing = byNode.get(node.memberId);
+                    if (existing !== undefined)
+                        existing.push(resolvedOrder);
+                }
+            }
+        }
+        return {
+            byNode,
+            linkedOrders,
+            observedResponses,
+            invalidAttachedEvidence,
+            terminalSnapshotLookupFailed,
+        };
+    }
+    recoveryGraphOrderIsAttached(request, order) {
+        return this.recoveryGraphAttachmentKey(request, order) !== null;
+    }
+    recoveryGraphOrderMayBeAttached(request, order) {
+        return [
+            order.cOID,
+            order.order_ref,
+            order.parentId,
+            order.parent_id,
+            order.parentClientOrderId,
+            order.parent_order_ref,
+        ].some((value) => (typeof value === "string" || typeof value === "number") &&
+            String(value).trim() === request.rootClientOrderId);
+    }
+    recoveryGraphAttachmentKey(request, order) {
+        const parentIdentity = this.consistentStringAliases(order.parentId, order.parent_id, order.parentClientOrderId, order.parent_order_ref);
+        const clientIdentity = this.consistentStringAliases(order.cOID, order.order_ref);
+        if (!parentIdentity.valid || !clientIdentity.valid)
+            return null;
+        const parentId = parentIdentity.value ?? "";
+        if (parentId === request.rootClientOrderId)
+            return "child";
+        const clientOrderId = clientIdentity.value;
+        if (clientOrderId === request.rootClientOrderId && parentId === "")
+            return "root";
+        return null;
+    }
+    terminalOrderTicketConflicts(first, second) {
+        const firstTicket = this.terminalOrderTicketFingerprint(first);
+        const secondTicket = this.terminalOrderTicketFingerprint(second);
+        return Object.keys(firstTicket).some((field) => field in secondTicket && firstTicket[field] !== secondTicket[field]);
+    }
+    terminalOrderTicketIsValid(order) {
+        return !Object.values(this.terminalOrderTicketFingerprint(order)).includes("__MALFORMED_TERMINAL_TICKET_FIELD__");
+    }
+    terminalOrderTicketFingerprint(order) {
+        const ticket = {};
+        const malformed = "__MALFORMED_TERMINAL_TICKET_FIELD__";
+        const addAliases = (field, values, normalize) => {
+            const provided = values.filter((value) => value !== undefined);
+            if (provided.length === 0)
+                return;
+            const normalized = provided.map(normalize);
+            const [first] = normalized;
+            ticket[field] =
+                first !== undefined && normalized.every((value) => value === first) ? first : malformed;
+        };
+        const normalizeNumber = (value) => {
+            if (typeof value === "number" && Number.isFinite(value)) {
+                return String(value);
+            }
+            if (typeof value === "string" && value.trim() !== "") {
+                const numeric = Number(value);
+                return Number.isFinite(numeric) ? String(numeric) : undefined;
+            }
+            return undefined;
+        };
+        addAliases("conid", [order.conid], normalizeNumber);
+        if (order.conidex !== undefined) {
+            ticket["conidex"] =
+                typeof order.conidex === "string"
+                    ? JSON.stringify(this.parseComboLegs(order.conidex))
+                    : malformed;
+        }
+        addAliases("orderType", [order.order_type, order.orderType], (value) => typeof value === "string" ? this.normalizeOrderType(value) : undefined);
+        addAliases("side", [order.side], (value) => typeof value === "string" ? this.normalizeOrderSide(value) : undefined);
+        addAliases("quantity", [order.total_size, order.totalSize, order.size], normalizeNumber);
+        addAliases("price", [order.limitPrice, order.limit_price, order.stopPrice, order.price], normalizeNumber);
+        addAliases("tif", [order.tif, order.timeInForce], (value) => typeof value === "string" ? value.toUpperCase() : undefined);
+        addAliases("outsideRTH", [order.outsideRTH, order.outside_rth], (value) => typeof value === "boolean" ? value : undefined);
+        return ticket;
+    }
+    orderHasExactAccount(order, accountId) {
+        const accounts = [order.account, order.acct];
+        const provided = accounts.filter((account) => account !== undefined);
+        return (provided.length > 0 &&
+            provided.every((account) => typeof account === "string" && account === accountId));
+    }
+    orderMatchesExactRecoveryIdentity(order, accountId, orderId) {
+        return this.orderHasExactAccount(order, accountId) && this.recoveryOrderId(order) === orderId;
+    }
+    orderHasValidRecoveryStatus(order) {
+        const provided = [order.order_status, order.orderStatus, order.status].filter((status) => status !== undefined);
+        if (provided.length === 0)
+            return true;
+        const normalized = provided.map((status) => this.canonicalIbkrOrderStatus(status));
+        const [first] = normalized;
+        return first !== undefined && normalized.every((status) => status === first);
+    }
+    assignRecoveryGraphCandidates(unresolvedNodes, terminalCandidates, usedOrderIds) {
+        const assignments = new Map();
+        const uniqueCandidates = new Map();
+        for (const node of unresolvedNodes) {
+            const candidates = terminalCandidates.get(node.memberId) ?? [];
+            if (candidates.length !== 1)
+                continue;
+            const order = candidates[0];
+            if (order === undefined)
+                continue;
+            const orderId = this.recoveryOrderId(order);
+            if (orderId === undefined || usedOrderIds.has(orderId))
+                continue;
+            const owners = uniqueCandidates.get(orderId) ?? [];
+            owners.push({ node, order });
+            uniqueCandidates.set(orderId, owners);
+        }
+        for (const owners of uniqueCandidates.values()) {
+            const owner = owners[0];
+            if (owners.length !== 1 || owner === undefined)
+                continue;
+            assignments.set(owner.node.memberId, owner.order);
+        }
+        return assignments;
+    }
     async acknowledgeOrderWarning(input) {
         if (!input.replyId.trim())
             throw new Error("An exact warning reply ID is required");
@@ -372,12 +910,12 @@ export class IbkrClient {
         const order = await this.req({
             path: `iserver/account/order/status/${encodeURIComponent(orderId)}`,
         });
-        if (String(order.order_id ?? order.orderId ?? "") !== orderId) {
-            throw new Error(`IBKR response does not match the requested order ${orderId}`);
-        }
-        if ((order.account ?? order.acct) !== accountId) {
+        if (!this.orderHasExactAccount(order, accountId)) {
             throw new Error(`IBKR order ${orderId} does not belong to the requested account`);
         }
+        if (this.recoveryOrderId(order) !== orderId) {
+            throw new Error(`IBKR response does not match the requested order ${orderId}`);
+        }
         const lifecycle = this.normalizeDerivativeOrderLifecycle(accountId, orderId, order);
         if (lifecycle.status === "UNKNOWN") {
             throw new Error(`IBKR order ${orderId} returned an unrecognized status`);
@@ -411,6 +949,59 @@ export class IbkrClient {
         }
         return this.getDerivativeOrderStatus(input.accountId, String(orderId));
     }
+    async listActiveDerivativeOrders(accountId) {
+        if (!accountId.trim())
+            throw new Error("An exact account ID is required");
+        await this.prepareBrokerageAccount(accountId);
+        const response = await this.req({
+            path: "iserver/account/orders",
+            params: { force: true, accountId },
+        });
+        const flattened = this.flattenCompleteOrderSnapshot(response);
+        if (flattened === null) {
+            throw new Error("IBKR active-order snapshot is incomplete");
+        }
+        const invalidAccountEvidence = flattened.find(({ order }) => {
+            const returnedAccounts = [order.account, order.acct];
+            const providedAccounts = returnedAccounts.filter((value) => value !== undefined);
+            return (providedAccounts.length === 0 ||
+                providedAccounts.some((returnedAccount) => typeof returnedAccount !== "string" || returnedAccount !== accountId));
+        });
+        if (invalidAccountEvidence !== undefined) {
+            throw new Error("IBKR active-order response did not provide unambiguous account identity");
+        }
+        const normalized = flattened.map(({ order, nestedParent }) => this.normalizeActiveDerivativeOrder(accountId, order, nestedParent));
+        const byOrderId = new Map();
+        const byClientId = new Map();
+        for (const order of normalized) {
+            if (order.orderId !== null) {
+                const members = byOrderId.get(order.orderId) ?? [];
+                members.push(order);
+                byOrderId.set(order.orderId, members);
+            }
+            if (order.clientOrderId !== null) {
+                const members = byClientId.get(order.clientOrderId) ?? [];
+                members.push(order);
+                byClientId.set(order.clientOrderId, members);
+            }
+        }
+        for (const order of normalized) {
+            if (order.orderId !== null && (byOrderId.get(order.orderId)?.length ?? 0) > 1) {
+                this.addOrderUncertainty(order, "DUPLICATE_MEMBER");
+            }
+            const parentIdentity = order.parentOrderId ?? order.parentClientOrderId;
+            if (parentIdentity === null)
+                continue;
+            const brokerMatches = byOrderId.get(parentIdentity) ?? [];
+            const clientMatches = byClientId.get(parentIdentity) ?? [];
+            const matches = new Set([...brokerMatches, ...clientMatches]);
+            if (matches.size === 0)
+                this.addOrderUncertainty(order, "MISSING_PARENT");
+            if (matches.size > 1)
+                this.addOrderUncertainty(order, "AMBIGUOUS_PARENT");
+        }
+        return normalized;
+    }
     async getDerivativeExecutions(input) {
         if (!input.accountId.trim())
             throw new Error("An exact account ID is required");
@@ -702,6 +1293,174 @@ export class IbkrClient {
             }
         }
     }
+    validateOrderGraph(request) {
+        if (!request.accountId.trim())
+            throw new Error("An explicit IBKR account ID is required");
+        if (!request.rootClientOrderId.trim() || request.rootClientOrderId.length > 48) {
+            throw new Error("Root client order ID must contain 1 to 48 characters");
+        }
+        if (request.nodes.length < 1 || request.nodes.length > 8) {
+            throw new Error("Derivative order graphs require 1 to 8 members");
+        }
+        const seen = new Set();
+        let roots = 0;
+        for (const node of request.nodes) {
+            if (!node.memberId.trim() ||
+                node.memberId.length > 15 ||
+                !/^[A-Za-z0-9_-]+$/.test(node.memberId)) {
+                throw new Error("Graph member IDs must contain 1 to 15 safe characters");
+            }
+            if (seen.has(node.memberId))
+                throw new Error("Graph member IDs must be unique");
+            if (node.accountId !== request.accountId)
+                throw new Error("Every graph member must target the graph account");
+            if (node.parentMemberId === undefined)
+                roots += 1;
+            else if (!seen.has(node.parentMemberId))
+                throw new Error("Graph parents must precede their children");
+            else if (node.parentMemberId !== request.nodes[0]?.memberId)
+                throw new Error("Derivative order graphs support only root-to-child attachments");
+            if ("legs" in node) {
+                this.validateComboPreview(node);
+            }
+            else {
+                this.validateGraphSingleNode(node);
+            }
+            seen.add(node.memberId);
+        }
+        if (roots !== 1 || request.nodes[0]?.parentMemberId !== undefined) {
+            throw new Error("Derivative order graphs require exactly one root as the first member");
+        }
+    }
+    validateGraphSingleNode(node) {
+        const orderType = node.orderType;
+        if (orderType !== "LMT" && orderType !== "STP" && orderType !== "MKT") {
+            throw new Error("Graph single order type must be LMT, STP, or MKT");
+        }
+        if (!Number.isSafeInteger(node.quantity) || node.quantity <= 0)
+            throw new Error("Order quantity must be a positive integer");
+        if (!Number.isSafeInteger(node.contract.conid) || node.contract.conid <= 0)
+            throw new Error("Order contract has an invalid IBKR conid");
+        if (node.orderType === "LMT" && (!Number.isFinite(node.limit) || node.limit <= 0))
+            throw new Error("LIMIT order requires a positive limit price");
+        if (node.orderType === "STP" && (!Number.isFinite(node.stopPrice) || node.stopPrice <= 0))
+            throw new Error("STOP order requires a positive stop price");
+        this.cmeOperatorMetadata(node.contract.assetClass, node);
+    }
+    graphClientOrderId(request, node) {
+        return node.parentMemberId === undefined
+            ? request.rootClientOrderId
+            : `${request.rootClientOrderId}:${node.memberId}`;
+    }
+    graphOrderTicket(request, node) {
+        const parent = request.nodes.find(({ memberId }) => memberId === node.parentMemberId);
+        if (node.parentMemberId !== undefined && parent === undefined) {
+            throw new Error("Graph parent evidence was lost after validation");
+        }
+        const identity = parent === undefined
+            ? { cOID: this.graphClientOrderId(request, node) }
+            : { parentId: this.graphClientOrderId(request, parent) };
+        if ("legs" in node)
+            return {
+                ...this.comboOrderTicket(node),
+                ...identity,
+                ...this.cmeOperatorMetadata(node.legs[0].contract.assetClass, node),
+            };
+        return {
+            acctId: node.accountId,
+            conid: node.contract.conid,
+            orderType: node.orderType,
+            side: node.side,
+            ...(node.orderType === "LMT"
+                ? { price: node.limit }
+                : node.orderType === "STP"
+                    ? { price: node.stopPrice }
+                    : {}),
+            tif: node.tif,
+            quantity: node.quantity,
+            outsideRTH: node.session === "OVERNIGHT",
+            ...identity,
+            ...this.cmeOperatorMetadata(node.contract.assetClass, node),
+        };
+    }
+    liveOrderMatchesGraphNode(request, node, order) {
+        const parentIdentity = this.consistentStringAliases(order.parentId, order.parent_id, order.parentClientOrderId, order.parent_order_ref);
+        if (!parentIdentity.valid)
+            return false;
+        if (node.parentMemberId === undefined) {
+            const clientIdentity = this.consistentStringAliases(order.cOID, order.order_ref);
+            if (!clientIdentity.valid || clientIdentity.value !== request.rootClientOrderId)
+                return false;
+            if (parentIdentity.value !== undefined)
+                return false;
+        }
+        else if (parentIdentity.value !== request.rootClientOrderId)
+            return false;
+        if ("legs" in node) {
+            const liveLegs = this.parseComboLegs(order.conidex);
+            const orderType = this.normalizeOrderType(order.order_type ?? order.orderType);
+            const side = this.normalizeOrderSide(order.side);
+            const quantity = this.firstPositiveNumber(order.total_size, order.totalSize, order.size);
+            const price = this.firstNumber(order.limitPrice, order.limit_price, order.price);
+            const expectedPrice = node.priceEffect === "CREDIT" ? -node.limit : node.limit;
+            const outsideRth = order.outsideRTH ?? order.outside_rth;
+            const tif = order.tif ?? order.timeInForce;
+            return (liveLegs.length === node.legs.length &&
+                node.legs.every((leg, index) => {
+                    const liveLeg = liveLegs[index];
+                    return liveLeg?.conid === leg.contract.conid && liveLeg.ratio === leg.ratio;
+                }) &&
+                orderType === this.normalizeOrderType("LMT") &&
+                side === "BUY" &&
+                quantity === node.quantity &&
+                price === expectedPrice &&
+                (tif === undefined || tif.toUpperCase() === node.tif) &&
+                (outsideRth === undefined || outsideRth === (node.session === "OVERNIGHT")));
+        }
+        const orderType = this.normalizeOrderType(order.order_type ?? order.orderType);
+        const expectedOrderType = this.normalizeOrderType(node.orderType);
+        const side = this.normalizeOrderSide(order.side);
+        const quantity = this.firstPositiveNumber(order.total_size, order.totalSize, order.size);
+        const price = node.orderType === "LMT"
+            ? this.firstNumber(order.limitPrice, order.limit_price, order.price)
+            : node.orderType === "STP"
+                ? this.firstNumber(order.stopPrice, order.price)
+                : undefined;
+        const expectedPrice = node.orderType === "LMT" ? node.limit : node.orderType === "STP" ? node.stopPrice : undefined;
+        const outsideRth = order.outsideRTH ?? order.outside_rth;
+        const tif = order.tif ?? order.timeInForce;
+        return (order.conid === node.contract.conid &&
+            orderType === expectedOrderType &&
+            side === node.side &&
+            quantity === node.quantity &&
+            price === expectedPrice &&
+            (tif === undefined || tif.toUpperCase() === node.tif) &&
+            (outsideRth === undefined || outsideRth === (node.session === "OVERNIGHT")));
+    }
+    recoveryOrderMatchesGraphNode(request, node, order) {
+        try {
+            return this.liveOrderMatchesGraphNode(request, node, order);
+        }
+        catch {
+            return false;
+        }
+    }
+    terminalOrderMatchesGraphNode(request, node, order) {
+        try {
+            const tif = order.tif ?? order.timeInForce;
+            const outsideRth = order.outsideRTH ?? order.outside_rth;
+            const status = order.order_status ?? order.orderStatus ?? order.status;
+            if (typeof tif !== "string" ||
+                typeof outsideRth !== "boolean" ||
+                typeof status !== "string") {
+                return false;
+            }
+            return this.recoveryOrderMatchesGraphNode(request, node, order);
+        }
+        catch {
+            return false;
+        }
+    }
     validateSingleOrder(request) {
         this.validateSingleOrderFields(request);
         const identityFields = request;
@@ -833,6 +1592,122 @@ export class IbkrClient {
         }
         return this.singleOrderRecoveryResult(decoded, orders);
     }
+    graphMemberEvidence(request, node, order) {
+        const index = request.nodes.findIndex(({ memberId }) => memberId === node.memberId);
+        let depth = 0;
+        let parentId = node.parentMemberId;
+        while (parentId !== undefined) {
+            depth += 1;
+            parentId = request.nodes.find(({ memberId }) => memberId === parentId)?.parentMemberId;
+        }
+        const rawId = order?.order_id ?? order?.orderId;
+        const orderId = typeof rawId === "string" || typeof rawId === "number" ? String(rawId).trim() || null : null;
+        const filledQuantity = this.firstNumber(order?.cum_fill, order?.cumFill, order?.filledQuantity, order?.filled);
+        const quantity = this.firstPositiveNumber(order?.total_size, order?.totalSize, order?.size);
+        const remainingQuantity = this.firstNumber(order?.remainingQuantity, order?.remaining_size, order?.remaining) ??
+            (quantity !== undefined && filledQuantity !== undefined
+                ? Math.max(0, quantity - filledQuantity)
+                : undefined);
+        return {
+            memberId: node.memberId,
+            role: index < 0
+                ? "unknown"
+                : depth === 0
+                    ? "root"
+                    : depth === 1
+                        ? "child"
+                        : depth === 2
+                            ? "grandchild"
+                            : "descendant",
+            parentMemberId: node.parentMemberId ?? null,
+            parentOrderId: null,
+            orderId,
+            status: order === undefined
+                ? "WARNING_PENDING"
+                : this.normalizeDerivativeOrderStatus(order.order_status ?? order.orderStatus ?? order.status, filledQuantity ?? 0, remainingQuantity ?? 0),
+            clientOrderId: this.graphClientOrderId(request, node),
+            request: node,
+        };
+    }
+    attachGraphParentOrderIds(members) {
+        const ids = new Map(members.map(({ memberId, orderId }) => [memberId, orderId]));
+        return members.map((member) => ({
+            ...member,
+            parentOrderId: member.parentMemberId === null ? null : (ids.get(member.parentMemberId) ?? null),
+        }));
+    }
+    normalizeOrderGraphSubmission(response, request, previousMembers) {
+        const decoded = this.decodeOrderSubmission(response);
+        const cleanOrders = decoded.warnings.length === 0 &&
+            decoded.errors.length === 0 &&
+            decoded.unrecognizedResponses.length === 0;
+        const distinct = new Set(decoded.orders.map(({ orderId }) => orderId)).size === decoded.orders.length;
+        const canCorrelatePositionally = cleanOrders && distinct && decoded.orders.length === request.nodes.length;
+        const members = this.attachGraphParentOrderIds(request.nodes.map((node, index) => {
+            const order = canCorrelatePositionally ? decoded.orders[index] : undefined;
+            if (order === undefined)
+                return (previousMembers.find(({ memberId }) => memberId === node.memberId) ??
+                    this.graphMemberEvidence(request, node));
+            const evidence = this.graphMemberEvidence(request, node, {
+                order_id: order.orderId,
+                order_status: order.status,
+            });
+            return { ...evidence, status: order.status };
+        }));
+        if (decoded.warnings.length === 1 &&
+            decoded.orders.length === 0 &&
+            decoded.errors.length === 0 &&
+            decoded.unrecognizedResponses.length === 0) {
+            const warning = decoded.warnings[0];
+            if (warning === undefined)
+                throw new Error("Graph warning evidence was lost");
+            return {
+                state: "warning",
+                rootClientOrderId: request.rootClientOrderId,
+                members,
+                warnings: decoded.warnings,
+                continuation: { replyId: warning.replyId, request, members },
+            };
+        }
+        if (decoded.errors.length > 0 &&
+            !decoded.responseIsArray &&
+            decoded.orders.length === 0 &&
+            decoded.warnings.length === 0 &&
+            decoded.unrecognizedResponses.length === 0) {
+            return {
+                state: "rejected",
+                rootClientOrderId: request.rootClientOrderId,
+                members,
+                reasons: decoded.errors.map(({ message }) => message),
+                errors: decoded.errors,
+            };
+        }
+        if (cleanOrders &&
+            distinct &&
+            decoded.orders.length === request.nodes.length &&
+            decoded.pendingCancelOrderIds.length === 0 &&
+            decoded.orders.every(({ status }) => status !== "UNKNOWN" && status !== "REJECTED" && status !== "CANCELED")) {
+            return {
+                state: "accepted",
+                rootClientOrderId: request.rootClientOrderId,
+                members,
+                warnings: [],
+            };
+        }
+        return {
+            state: "recovery_required",
+            rootClientOrderId: request.rootClientOrderId,
+            members,
+            reasons: [
+                this.submissionRecoveryReason(decoded, decoded.orders.length, request.nodes.length),
+            ],
+            warnings: decoded.warnings,
+            errors: decoded.errors,
+            unrecognizedResponses: canCorrelatePositionally
+                ? decoded.unrecognizedResponses
+                : [...decoded.unrecognizedResponses, ...decoded.orders],
+        };
+    }
     normalizeMultiOrderSubmission(response, parentClientOrderId) {
         const decoded = this.decodeOrderSubmission(response);
         const hasDistinctBrokerOrderIds = decoded.orders.length === 2 &&
@@ -1083,6 +1958,198 @@ export class IbkrClient {
             updatedAt: this.parseOrderTime(order)?.toISOString() ?? null,
         };
     }
+    flattenCompleteOrderSnapshot(response) {
+        if (typeof response !== "object" || response === null || Array.isArray(response))
+            return null;
+        const record = response;
+        if (record["snapshot"] !== true || !Array.isArray(record["orders"]))
+            return null;
+        const flattened = [];
+        const visiting = new Set();
+        const visit = (orders, nestedParent) => {
+            for (const rawOrder of orders) {
+                if (typeof rawOrder !== "object" || rawOrder === null || Array.isArray(rawOrder))
+                    return false;
+                if (visiting.has(rawOrder))
+                    return false;
+                visiting.add(rawOrder);
+                const orderRecord = rawOrder;
+                const childCollections = [orderRecord["childOrders"], orderRecord["children"]];
+                if (childCollections.some((children) => children !== undefined && !Array.isArray(children))) {
+                    return false;
+                }
+                const order = rawOrder;
+                flattened.push({ order, nestedParent });
+                const children = new Set();
+                for (const collection of childCollections) {
+                    if (Array.isArray(collection)) {
+                        for (const child of collection)
+                            children.add(child);
+                    }
+                }
+                if (!visit([...children], order))
+                    return false;
+                visiting.delete(rawOrder);
+            }
+            return true;
+        };
+        return visit(record["orders"], null) ? flattened : null;
+    }
+    normalizeActiveDerivativeOrder(accountId, order, nestedParent) {
+        const uncertainty = [];
+        const total = this.firstNumber(order.total_size, order.totalSize, order.size) ?? null;
+        const filled = this.firstNumber(order.cum_fill, order.cumFill, order.filledQuantity, order.filled) ?? null;
+        const remaining = this.firstNumber(order.remainingQuantity, order.remaining_size, order.remaining) ??
+            (total !== null && filled !== null ? Math.max(0, total - filled) : null);
+        if (total === null || filled === null || remaining === null)
+            uncertainty.push("INCOMPLETE_QUANTITIES");
+        const rawStatus = order.order_status ?? order.orderStatus ?? order.status;
+        const status = this.normalizeDerivativeOrderStatus(rawStatus, filled ?? 0, remaining ?? 0);
+        if (status === "UNKNOWN")
+            uncertainty.push("UNKNOWN_STATUS");
+        const rawOrderId = order.order_id ?? order.orderId;
+        if (rawOrderId === undefined)
+            uncertainty.push("MISSING_BROKER_ORDER_ID");
+        const explicitParentOrderId = order.parent_order_id ?? order.parentOrderId ?? order.parent_id;
+        const explicitParentClientId = order.parentClientOrderId ?? order.parent_order_ref ?? order.parentId;
+        const nestedBrokerId = nestedParent?.order_id ?? nestedParent?.orderId;
+        const nestedClientId = nestedParent?.cOID ?? nestedParent?.order_ref;
+        if (nestedParent !== null &&
+            explicitParentOrderId === undefined &&
+            explicitParentClientId === undefined) {
+            uncertainty.push("PARTIAL_GRAPH");
+        }
+        const legs = this.normalizeActiveDerivativeLegs(order, total, uncertainty);
+        const orderTime = this.parseOrderTime(order)?.toISOString() ?? null;
+        return {
+            accountId,
+            orderId: rawOrderId === undefined ? null : String(rawOrderId),
+            clientOrderId: order.cOID ?? order.order_ref ?? null,
+            parentOrderId: explicitParentOrderId === undefined
+                ? nestedBrokerId === undefined
+                    ? null
+                    : String(nestedBrokerId)
+                : String(explicitParentOrderId),
+            parentClientOrderId: explicitParentClientId === undefined
+                ? (nestedClientId ?? null)
+                : String(explicitParentClientId),
+            graphRole: nestedParent !== null ||
+                explicitParentOrderId !== undefined ||
+                explicitParentClientId !== undefined
+                ? "CHILD"
+                : rawOrderId === undefined
+                    ? "UNKNOWN"
+                    : "ROOT",
+            status,
+            totalQuantity: total,
+            filledQuantity: filled,
+            remainingQuantity: remaining,
+            tif: order.tif ?? order.timeInForce ?? null,
+            session: order.outsideRTH === true || order.outside_rth === true
+                ? "OVERNIGHT"
+                : order.outsideRTH === false || order.outside_rth === false
+                    ? "REGULAR"
+                    : "UNKNOWN",
+            orderType: this.normalizeOrderType(order.order_type ?? order.orderType) ?? null,
+            limitPrice: this.firstNumber(order.limitPrice, order.limit_price, order.price) ?? null,
+            stopPrice: this.firstNumber(order.stopPrice) ?? null,
+            enteredAt: orderTime,
+            updatedAt: order.lastExecutionTime_r !== undefined || order.lastExecutionTime !== undefined
+                ? orderTime
+                : null,
+            legs,
+            uncertainty,
+        };
+    }
+    normalizeActiveDerivativeLegs(order, total, orderUncertainty) {
+        const description = [
+            order.orderDescriptionWithContract,
+            order.order_description_with_contract,
+            order.contractDescription1,
+            order.contract_description_1,
+            order.description1,
+            order.symbol,
+        ]
+            .filter((value) => typeof value === "string")
+            .join(" ");
+        const describedOptions = [...description.matchAll(/([A-Z ]{1,6}\d{6}[CP]\d{8})/gi)].flatMap((match) => {
+            const symbol = match[1]?.toUpperCase() ?? "";
+            const parsed = parseOsiOptionSymbol(symbol);
+            return parsed === null ? [] : [{ symbol, ...parsed }];
+        });
+        const uniqueDescribedOptions = describedOptions.filter((option, index) => describedOptions.findIndex((candidate) => candidate.symbol === option.symbol) === index);
+        const side = this.normalizeOrderSide(order.side);
+        const signedSide = side === "BUY" ? 1 : side === "SELL" ? -1 : null;
+        let rawLegs = [];
+        const conidex = typeof order.conidex === "string" ? order.conidex.trim() : null;
+        if (conidex?.includes(";;;")) {
+            const match = /^(\d+)(?:@[A-Za-z0-9._-]+)?;;;(.+)$/.exec(conidex);
+            if (match?.[1] !== "28812380") {
+                orderUncertainty.push("MALFORMED_CONIDEX");
+            }
+            else {
+                rawLegs = (match[2] ?? "").split(",").map((member) => {
+                    const legMatch = /^(\d+)\/([+-]?\d+)$/.exec(member.trim());
+                    const conid = Number(legMatch?.[1]);
+                    const ratio = Number(legMatch?.[2]);
+                    if (!legMatch ||
+                        !Number.isSafeInteger(conid) ||
+                        conid <= 0 ||
+                        !Number.isSafeInteger(ratio) ||
+                        ratio === 0) {
+                        return { conid: null, ratio: null, quantityRatio: null };
+                    }
+                    return {
+                        conid,
+                        ratio: signedSide === null ? null : signedSide * ratio,
+                        quantityRatio: Math.abs(ratio),
+                    };
+                });
+                if (rawLegs.length === 0 || rawLegs.some((leg) => leg.conid === null)) {
+                    orderUncertainty.push("MALFORMED_CONIDEX");
+                }
+            }
+            if (rawLegs.length === 0)
+                orderUncertainty.push("AGGREGATE_ONLY");
+        }
+        else if (Number.isSafeInteger(order.conid) && Number(order.conid) > 0) {
+            rawLegs = [{ conid: Number(order.conid), ratio: signedSide, quantityRatio: 1 }];
+        }
+        else {
+            if (conidex)
+                orderUncertainty.push("MALFORMED_CONIDEX");
+            orderUncertainty.push("MISSING_LEG_IDENTITY");
+        }
+        if (rawLegs.length === 0) {
+            rawLegs = [{ conid: null, ratio: null, quantityRatio: null }];
+        }
+        return rawLegs.map((leg) => {
+            const legUncertainty = [];
+            if (leg.conid === null)
+                legUncertainty.push("MISSING_LEG_IDENTITY");
+            if (leg.ratio === null) {
+                const directionUncertainty = leg.conid !== null && signedSide === null ? "UNKNOWN_SIDE" : "MALFORMED_CONIDEX";
+                legUncertainty.push(directionUncertainty);
+                if (!orderUncertainty.includes(directionUncertainty)) {
+                    orderUncertainty.push(directionUncertainty);
+                }
+            }
+            return {
+                conid: leg.conid,
+                ratio: leg.ratio,
+                side: leg.ratio === null ? "UNKNOWN" : leg.ratio > 0 ? "BUY" : "SELL",
+                quantity: total === null || leg.quantityRatio === null ? null : total * leg.quantityRatio,
+                option: rawLegs.length === 1 && uniqueDescribedOptions.length === 1
+                    ? (uniqueDescribedOptions[0] ?? null)
+                    : null,
+                uncertainty: legUncertainty,
+            };
+        });
+    }
+    addOrderUncertainty(order, uncertainty) {
+        if (!order.uncertainty.includes(uncertainty))
+            order.uncertainty.push(uncertainty);
+    }
     normalizeDerivativeExecution(accountId, trade) {
         if (!trade.execution_id || !Number.isSafeInteger(trade.conid) || Number(trade.conid) <= 0) {
             return undefined;
@@ -1130,8 +2197,39 @@ export class IbkrClient {
         const parsed = new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
         return Number.isNaN(parsed.getTime()) ? null : parsed.toISOString();
     }
+    recoveryOrderId(order) {
+        const identity = this.consistentScalarAliases(order.order_id, order.orderId);
+        return identity.valid ? identity.value : undefined;
+    }
+    consistentScalarAliases(...aliases) {
+        const provided = aliases.filter((alias) => alias !== undefined);
+        if (provided.length === 0)
+            return { valid: true, value: undefined };
+        const normalized = provided.map((alias) => {
+            if (typeof alias !== "string" && typeof alias !== "number")
+                return undefined;
+            const value = String(alias).trim();
+            return value.length === 0 ? undefined : value;
+        });
+        const [first] = normalized;
+        if (first === undefined || normalized.some((value) => value !== first)) {
+            return { valid: false, value: undefined };
+        }
+        return { valid: true, value: first };
+    }
+    consistentStringAliases(...aliases) {
+        const provided = aliases.filter((alias) => alias !== undefined);
+        if (provided.length === 0)
+            return { valid: true, value: undefined };
+        const normalized = provided.map((alias) => typeof alias === "string" && alias.trim() !== "" ? alias.trim() : undefined);
+        const [first] = normalized;
+        if (first === undefined || normalized.some((value) => value !== first)) {
+            return { valid: false, value: undefined };
+        }
+        return { valid: true, value: first };
+    }
     trimmedString(value) {
-        if (value === undefined)
+        if (typeof value !== "string")
             return null;
         const trimmed = value.trim();
         return trimmed.length === 0 ? null : trimmed;
@@ -1296,14 +2394,14 @@ export class IbkrClient {
     }
     normalizeDerivativeOrderStatus(value, filledQuantity, remainingQuantity) {
         const status = this.canonicalIbkrOrderStatus(value);
-        if (filledQuantity > 0 && remainingQuantity > 0)
-            return "PARTIALLY_FILLED";
         if (status === "FILLED")
             return "FILLED";
         if (status === "CANCELLED" || status === "CANCELED")
             return "CANCELED";
         if (status === "INACTIVE" || status === "REJECTED")
             return "REJECTED";
+        if (filledQuantity > 0 && remainingQuantity > 0)
+            return "PARTIALLY_FILLED";
         if (status === "API_PENDING" || status === "PENDING_SUBMIT")
             return "PENDING";
         if (status !== undefined && IBKR_WORKING_STATUSES.has(status))
@@ -1311,8 +2409,10 @@ export class IbkrClient {
         return "UNKNOWN";
     }
     canonicalIbkrOrderStatus(value) {
+        if (typeof value !== "string")
+            return undefined;
         return value
-            ?.replace(/([a-z])([A-Z])/g, "$1_$2")
+            .replace(/([a-z])([A-Z])/g, "$1_$2")
             .replace(/\s+/g, "_")
             .toUpperCase();
     }
@@ -1365,11 +2465,14 @@ export class IbkrClient {
         if (brokerageAccounts.accounts && !brokerageAccounts.accounts.includes(accountId)) {
             throw new Error(`IBKR account ${accountId} is not available for trading/order queries.`);
         }
-        await this.req({
+        const switchedAccount = await this.req({
             path: "iserver/account",
             method: "POST",
             data: { acctId: accountId },
         });
+        if (switchedAccount.set !== true || switchedAccount.acctId !== accountId) {
+            throw new Error(`IBKR account switch was not confirmed for ${accountId}.`);
+        }
     }
     normalizeStockListing(symbol, listing) {
         const assetType = listing.assetClass === "STK" ? "EQUITY" : listing.assetClass;