gloomberb 0.9.3 → 0.9.4

package/src/plugins/ibkr/flex/index.test.ts

@@ -59,6 +59,10 @@ describe("parseFlexAccounts", () => {
               <FxPosition accountId="DU12345" assetCategory="CASH" functionalCurrency="USD" fxCurrency="USD" quantity="-303029.144938754" value="-303029.144938754" />
               <FxPosition accountId="DU12345" assetCategory="CASH" functionalCurrency="USD" fxCurrency="EUR" quantity="-351957.025" value="-405102.535775" />
             </FxPositions>
+            <OpenPositions>
+              <OpenPosition accountId="DU12345" symbol="AAPL" assetCategory="STK" position="100" currency="USD" positionValue="100000" fxRateToBase="1" />
+              <OpenPosition accountId="DU12345" symbol="ASML" assetCategory="STK" position="10" currency="EUR" positionValue="50000" fxRateToBase="1.2" />
+            </OpenPositions>
           </FlexStatement>
         </FlexStatements>
       </FlexQueryResponse>
@@ -71,7 +75,9 @@ describe("parseFlexAccounts", () => {
       name: "Main",
       currency: "USD",
       source: "flex",
+      asOfDate: "2026-03-27",
       netLiquidation: 764713.626876249,
+      grossPositionValue: 160000,
       totalCashValue: -1050953.720462251,
       settledCash: -917604.448220862,
       cashBalances: [
@@ -110,7 +116,9 @@ describe("parseFlexAccounts", () => {
         currency: "USD",
         source: "flex",
         updatedAt: new Date(2026, 2, 27).getTime(),
+        asOfDate: "2026-03-27",
         netLiquidation: 12345.67,
+        grossPositionValue: undefined,
         totalCashValue: undefined,
         settledCash: undefined,
         cashBalances: undefined,
@@ -190,9 +198,9 @@ describe("parseFlexPortfolioPerformance", () => {
 
 describe("requestFlexStatement", () => {
   test("uses the configured HTTP transport for statement requests", async () => {
-    const requests: string[] = [];
-    setHttpFetchTransport(async (url) => {
-      requests.push(url);
+    const requests: Array<{ url: string; init: RequestInit | undefined }> = [];
+    setHttpFetchTransport(async (url, init) => {
+      requests.push({ url, init });
       return new Response(
         "<FlexStatementResponse><ReferenceCode>987654</ReferenceCode></FlexStatementResponse>",
         { status: 200 },
@@ -202,16 +210,17 @@ describe("requestFlexStatement", () => {
     await expect(requestFlexStatement({
       token: "secret-flex-token",
       queryId: "12345",
-      endpoint: "https://gdcdyn.interactivebrokers.com/Universal/servlet/FlexStatementService.SendRequest",
+      endpoint: "https://ndcdyn.interactivebrokers.com/AccountManagement/FlexWebService/SendRequest",
     })).resolves.toBe("987654");
 
     expect(requests).toHaveLength(1);
-    expect(requests[0]).toContain("q=12345");
+    expect(requests[0]?.url).toContain("q=12345");
+    expect((requests[0]?.init?.headers as Record<string, string> | undefined)?.["User-Agent"]).toBeTruthy();
   });
 
   test("adds request context to vague IBKR Flex errors without exposing the token", async () => {
     globalThis.fetch = (async () => new Response(
-      "<FlexStatementResponse><ErrorMessage>Load failed</ErrorMessage></FlexStatementResponse>",
+      "<FlexStatementResponse><ErrorCode>1001</ErrorCode><ErrorMessage>Load failed</ErrorMessage></FlexStatementResponse>",
       { status: 200 },
     )) as unknown as typeof fetch;
 
@@ -220,14 +229,14 @@ describe("requestFlexStatement", () => {
       await requestFlexStatement({
         token: "secret-flex-token",
         queryId: "12345",
-        endpoint: "https://gdcdyn.interactivebrokers.com/Universal/servlet/FlexStatementService.SendRequest",
+        endpoint: "https://ndcdyn.interactivebrokers.com/AccountManagement/FlexWebService/SendRequest",
       });
     } catch (error) {
       message = error instanceof Error ? error.message : String(error);
     }
 
-    expect(message).toContain("IBKR Flex request failed while requesting the statement: Load failed.");
-    expect(message).toContain("Endpoint FlexStatementService.SendRequest");
+    expect(message).toContain("IBKR Flex request failed while requesting the statement: IBKR error 1001: Load failed.");
+    expect(message).toContain("Endpoint SendRequest");
     expect(message).toContain("query ID 12345");
     expect(message).toContain("token configured");
     expect(message).toContain("Flex Web Service is enabled");

package/src/plugins/ibkr/flex/index.ts

@@ -63,6 +63,34 @@ function parseFlexDate(raw: string | undefined): string | null {
   return new Date(parsed).toISOString().slice(0, 10);
 }
 
+function parseFlexGrossPositionValue(
+  body: string,
+  statementAccountId: string,
+  baseCurrency: string | undefined,
+): number | undefined {
+  let total = 0;
+  let hasValue = false;
+
+  for (const entry of body.matchAll(/<OpenPosition\b([^>]*)\/?>/g)) {
+    const attributes = parseAttributes(entry[1] ?? "");
+    const accountId = attributes.accountId || statementAccountId;
+    if (!accountId || (statementAccountId && accountId !== statementAccountId)) continue;
+
+    const marketValue = parseNumber(attributes.positionValue);
+    if (marketValue == null) continue;
+
+    const positionCurrency = attributes.currency || baseCurrency;
+    const fxRateToBase = parseNumber(attributes.fxRateToBase)
+      ?? (baseCurrency && positionCurrency === baseCurrency ? 1 : undefined);
+    if (fxRateToBase == null) continue;
+
+    total += Math.abs(marketValue * fxRateToBase);
+    hasValue = true;
+  }
+
+  return hasValue ? total : undefined;
+}
+
 function buildContractRef(attributes: Record<string, string>, symbol: string, assetCategory: string): BrokerContractRef | undefined {
   const conIdRaw = attributes.conid || attributes.conId;
   const strikeRaw = attributes.strike;
@@ -211,7 +239,9 @@ export function parseFlexAccounts(xml: string): BrokerAccount[] {
       currency: accountCurrency,
       source: "flex",
       updatedAt: parseFlexTimestamp(statementAttrs.whenGenerated, statementAttrs.toDate || statementAttrs.fromDate),
+      asOfDate: parseFlexDate(statementAttrs.toDate || statementAttrs.fromDate) ?? undefined,
       netLiquidation: parseNumber(changeInNavAttrs?.endingValue),
+      grossPositionValue: parseFlexGrossPositionValue(body, accountId, accountCurrency),
       totalCashValue: parseNumber(baseCashAttrs?.endingCash),
       settledCash: parseNumber(baseCashAttrs?.endingSettledCash),
       cashBalances: cashBalances.length > 0 ? cashBalances : undefined,

package/src/plugins/ibkr/flex/statement-client.ts

@@ -2,7 +2,8 @@ import { httpFetch } from "../../../utils/http-transport";
 import type { FlexQueryConfig } from "../config";
 import { IBKR_STATEMENT_URL } from "../config";
 
-const IBKR_STATEMENT_GET_URL = "https://gdcdyn.interactivebrokers.com/Universal/servlet/FlexStatementService.GetStatement";
+const IBKR_STATEMENT_GET_URL = "https://ndcdyn.interactivebrokers.com/AccountManagement/FlexWebService/GetStatement";
+const FLEX_USER_AGENT = "Gloomberb/1.0 Flex";
 const FLEX_STATEMENT_CACHE_MS = 15 * 60_000;
 const FLEX_STATEMENT_INITIAL_WAIT_MS = 3_000;
 const FLEX_STATEMENT_POLL_DELAY_MS = 5_000;
@@ -29,10 +30,54 @@ function decodeXmlText(value: string): string {
     .replace(/'/g, "'");
 }
 
+function extractXmlTag(text: string, tagName: string): string | null {
+  const match = text.match(new RegExp(`<${tagName}>\\s*([^<]*?)\\s*<\\/${tagName}>`, "i"));
+  return match?.[1] ? decodeXmlText(match[1].trim()) : null;
+}
+
 function extractFlexErrorMessage(text: string): string | null {
-  const errorMatch = text.match(/<ErrorMessage>([^<]+)<\/ErrorMessage>/);
-  if (errorMatch?.[1]) return decodeXmlText(errorMatch[1].trim());
-  return null;
+  const message = extractXmlTag(text, "ErrorMessage");
+  const code = extractXmlTag(text, "ErrorCode");
+  if (message && code) return `IBKR error ${code}: ${message}`;
+  return message;
+}
+
+function buildFlexUrl(endpoint: string, params: Record<string, string>): string {
+  const url = new URL(endpoint);
+  for (const [key, value] of Object.entries(params)) {
+    url.searchParams.set(key, value);
+  }
+  return url.toString();
+}
+
+function resolveFlexGetEndpoint(sendEndpoint: string | undefined): string {
+  if (!sendEndpoint || sendEndpoint === IBKR_STATEMENT_URL) return IBKR_STATEMENT_GET_URL;
+
+  try {
+    const url = new URL(sendEndpoint);
+    url.search = "";
+    if (url.pathname.endsWith("/SendRequest")) {
+      url.pathname = url.pathname.replace(/\/SendRequest$/, "/GetStatement");
+      return url.toString();
+    }
+    if (url.pathname.endsWith("FlexStatementService.SendRequest")) {
+      url.pathname = url.pathname.replace(/FlexStatementService\.SendRequest$/, "FlexStatementService.GetStatement");
+      return url.toString();
+    }
+  } catch {
+    return IBKR_STATEMENT_GET_URL;
+  }
+
+  return IBKR_STATEMENT_GET_URL;
+}
+
+function flexRequestInit(): RequestInit {
+  return {
+    headers: {
+      "User-Agent": FLEX_USER_AGENT,
+    },
+    signal: AbortSignal.timeout(30_000),
+  };
 }
 
 function endpointName(endpoint: string | undefined): string {
@@ -69,11 +114,15 @@ function flexError(providerMessage: string, context: FlexErrorContext): Error {
 
 export async function requestFlexStatement(config: FlexQueryConfig): Promise<string> {
   const endpoint = config.endpoint || IBKR_STATEMENT_URL;
-  const url = `${endpoint}?t=${config.token}&q=${config.queryId}&v=3`;
+  const url = buildFlexUrl(endpoint, {
+    t: config.token,
+    q: config.queryId,
+    v: "3",
+  });
   let resp: Response;
   let text: string;
   try {
-    resp = await httpFetch(url, { signal: AbortSignal.timeout(30_000) });
+    resp = await httpFetch(url, flexRequestInit());
     text = await resp.text();
   } catch (error) {
     throw flexError(error instanceof Error ? error.message : "Network request failed", {
@@ -84,8 +133,8 @@ export async function requestFlexStatement(config: FlexQueryConfig): Promise<str
     });
   }
 
-  const codeMatch = text.match(/<ReferenceCode>(\d+)<\/ReferenceCode>/);
-  if (!codeMatch) {
+  const referenceCode = extractXmlTag(text, "ReferenceCode");
+  if (!referenceCode) {
     throw flexError(extractFlexErrorMessage(text) || "No reference code returned", {
       phase: "request",
       endpoint,
@@ -95,7 +144,7 @@ export async function requestFlexStatement(config: FlexQueryConfig): Promise<str
     });
   }
 
-  return codeMatch[1]!;
+  return referenceCode;
 }
 
 async function getFlexStatement(
@@ -105,17 +154,22 @@ async function getFlexStatement(
 ): Promise<string> {
   await new Promise((resolve) => setTimeout(resolve, FLEX_STATEMENT_INITIAL_WAIT_MS));
 
-  const url = `${IBKR_STATEMENT_GET_URL}?t=${token}&q=${referenceCode}&v=3`;
+  const endpoint = resolveFlexGetEndpoint(context.endpoint);
+  const url = buildFlexUrl(endpoint, {
+    t: token,
+    q: referenceCode,
+    v: "3",
+  });
   for (let attempt = 0; attempt < FLEX_STATEMENT_MAX_DOWNLOAD_ATTEMPTS; attempt += 1) {
     let resp: Response;
     let text: string;
     try {
-      resp = await httpFetch(url, { signal: AbortSignal.timeout(30_000) });
+      resp = await httpFetch(url, flexRequestInit());
       text = await resp.text();
     } catch (error) {
       throw flexError(error instanceof Error ? error.message : "Network request failed", {
         phase: "download",
-        endpoint: context.endpoint,
+        endpoint,
         queryId: context.queryId,
         token,
         referenceCode,
@@ -135,7 +189,7 @@ async function getFlexStatement(
     if (providerMessage) {
       throw flexError(providerMessage, {
         phase: "download",
-        endpoint: context.endpoint,
+        endpoint,
         queryId: context.queryId,
         token,
         referenceCode,
@@ -146,7 +200,7 @@ async function getFlexStatement(
 
   throw flexError("statement generation timed out", {
     phase: "download",
-    endpoint: context.endpoint,
+    endpoint,
     queryId: context.queryId,
     token,
     referenceCode,

package/src/plugins/ibkr/gateway/account-loaders.ts

@@ -96,7 +96,7 @@ export async function loadIbkrAccounts({
     const result = await firstValueFrom(
       api.getAccountSummary(
         "All",
-        "NetLiquidation,TotalCashValue,SettledCash,AvailableFunds,BuyingPower,ExcessLiquidity,InitMarginReq,MaintMarginReq,$LEDGER:ALL",
+        "NetLiquidation,GrossPositionValue,TotalCashValue,SettledCash,AvailableFunds,BuyingPower,ExcessLiquidity,InitMarginReq,MaintMarginReq,$LEDGER:ALL",
       )
         .pipe(take(1), timeout(10_000)),
     );

package/src/plugins/ibkr/gateway/account-summary.ts

@@ -148,6 +148,7 @@ export function summarizeBrokerAccount(
     source: "gateway",
     updatedAt,
     netLiquidation: getAccountSummaryNumberWithAggregateFallback(tags, aggregateTags, "NetLiquidation", currency, allowAggregateCashBalances),
+    grossPositionValue: getAccountSummaryNumberWithAggregateFallback(tags, aggregateTags, "GrossPositionValue", currency, allowAggregateCashBalances),
     totalCashValue: getAccountSummaryNumberWithAggregateFallback(tags, aggregateTags, "TotalCashValue", currency, allowAggregateCashBalances),
     settledCash: getAccountSummaryNumberWithAggregateFallback(tags, aggregateTags, "SettledCash", currency, allowAggregateCashBalances),
     availableFunds: getAccountSummaryNumberWithAggregateFallback(tags, aggregateTags, "AvailableFunds", currency, allowAggregateCashBalances),

package/src/plugins/ibkr/gateway/service/index.test.ts

@@ -35,6 +35,7 @@ describe("summarizeBrokerAccount", () => {
   test("maps gateway account summary fields and ledger balances", () => {
     const tags = makeTags({
       NetLiquidation: { USD: "764713.62" },
+      GrossPositionValue: { USD: "1815667.34" },
       TotalCashValue: { USD: "-1050953.72" },
       SettledCash: { USD: "-917604.44" },
       AvailableFunds: { USD: "112345.67" },
@@ -52,6 +53,7 @@ describe("summarizeBrokerAccount", () => {
       source: "gateway",
       updatedAt: 1_717_000_000_000,
       netLiquidation: 764713.62,
+      grossPositionValue: 1815667.34,
       totalCashValue: -1050953.72,
       settledCash: -917604.44,
       availableFunds: 112345.67,
@@ -72,6 +74,7 @@ describe("summarizeBrokerAccount", () => {
   test("falls back to the aggregate cash summary for single-account gateways", () => {
     const accountTags = makeTags({
       NetLiquidation: { USD: "129360.15" },
+      GrossPositionValue: { USD: "1066.36" },
       TotalCashValue: { USD: "128293.79" },
       AvailableFunds: { USD: "129031.52" },
       BuyingPower: { USD: "860210.13" },
@@ -99,6 +102,7 @@ describe("summarizeBrokerAccount", () => {
       source: "gateway",
       updatedAt: 1_717_000_000_000,
       netLiquidation: 129360.15,
+      grossPositionValue: 1066.36,
       totalCashValue: 128293.79,
       settledCash: undefined,
       availableFunds: 129031.52,
@@ -119,6 +123,7 @@ describe("summarizeBrokerAccount", () => {
   test("falls back to aggregate summary metrics when a single-account gateway only returns the All row", () => {
     const aggregateTags = makeTags({
       NetLiquidation: { USD: "129360.15" },
+      GrossPositionValue: { USD: "1066.36" },
       TotalCashValue: { USD: "128293.79" },
       AvailableFunds: { USD: "129031.52" },
       BuyingPower: { USD: "860210.13" },
@@ -144,6 +149,7 @@ describe("summarizeBrokerAccount", () => {
       source: "gateway",
       updatedAt: 1_717_000_000_000,
       netLiquidation: 129360.15,
+      grossPositionValue: 1066.36,
       totalCashValue: 128293.79,
       settledCash: undefined,
       availableFunds: 129031.52,
@@ -164,6 +170,7 @@ describe("summarizeBrokerAccount", () => {
   test("maps account-level P&L into gateway account snapshots", () => {
     const tags = makeTags({
       NetLiquidation: { USD: "100000" },
+      GrossPositionValue: { USD: "75000" },
     });
 
     expect(summarizeBrokerAccount("DU12345", tags, 1_717_000_000_000, undefined, false, {
@@ -186,6 +193,7 @@ describe("summarizeBrokerAccount", () => {
       source: "gateway",
       updatedAt: 123,
       netLiquidation: undefined,
+      grossPositionValue: undefined,
       totalCashValue: undefined,
       settledCash: undefined,
       availableFunds: undefined,

package/src/plugins/pane-manager/gridlock.ts

@@ -8,15 +8,23 @@ import {
   getDockLeafLayouts,
   type LayoutBounds,
 } from "./dock-tree";
-import { finalizeLayout } from "./layout-state";
+import {
+  finalizeLayout,
+  removeUnavailablePaneTypes,
+  type PaneTypeAvailability,
+} from "./layout-state";
 
 export function gridlockAllPanes(
   layout: LayoutConfig,
   bounds: LayoutBounds = { x: 0, y: 0, width: 120, height: 40 },
+  paneTypes?: PaneTypeAvailability,
 ): LayoutConfig {
-  const dockedRects: GridlockRect[] = getDockLeafLayouts(layout, bounds)
+  const visibleLayout = paneTypes
+    ? removeUnavailablePaneTypes(layout, paneTypes)
+    : layout;
+  const dockedRects: GridlockRect[] = getDockLeafLayouts(visibleLayout, bounds)
     .map((leaf) => ({ instanceId: leaf.instanceId, ...leaf.rect }));
-  const floatingRects: GridlockRect[] = layout.floating.map((entry) => ({
+  const floatingRects: GridlockRect[] = visibleLayout.floating.map((entry) => ({
     instanceId: entry.instanceId,
     x: entry.x,
     y: entry.y,
@@ -24,10 +32,10 @@ export function gridlockAllPanes(
     height: entry.height,
   }));
   const allRects = [...dockedRects, ...floatingRects];
-  if (allRects.length === 0) return layout;
+  if (allRects.length === 0) return visibleLayout;
 
   return finalizeLayout({
-    ...layout,
+    ...visibleLayout,
     dockRoot: inferDockTreeFromRects(allRects, boundsForRects(allRects)),
     floating: [],
   });

package/src/plugins/pane-manager/layout-state.ts

@@ -169,3 +169,28 @@ export function removeFloatingPanes(layout: LayoutConfig): LayoutConfig {
     layout.floating.map((entry) => entry.instanceId),
   ));
 }
+
+export type PaneTypeAvailability = { has(paneId: string): boolean } | ((paneId: string) => unknown);
+
+function paneTypeIsAvailable(availability: PaneTypeAvailability, paneId: string): boolean {
+  return typeof availability === "function"
+    ? !!availability(paneId)
+    : availability.has(paneId);
+}
+
+export function removeUnavailablePaneTypes(
+  layout: LayoutConfig,
+  availability: PaneTypeAvailability,
+  options: { disabledPaneIds?: ReadonlySet<string> } = {},
+): LayoutConfig {
+  const unavailableInstanceIds = layout.instances
+    .filter((instance) => (
+      options.disabledPaneIds?.has(instance.paneId)
+      || !paneTypeIsAvailable(availability, instance.paneId)
+    ))
+    .map((instance) => instance.instanceId);
+
+  return unavailableInstanceIds.length > 0
+    ? removePaneInstances(layout, unavailableInstanceIds)
+    : layout;
+}

package/src/plugins/pane-manager.test.ts

@@ -109,6 +109,39 @@ describe("pane-manager split-tree drops", () => {
     expect(getDockedPaneIds(next)).toHaveLength(layout.instances.length);
   });
 
+  test("gridlock drops pane types that cannot render before tiling", () => {
+    const layout: LayoutConfig = {
+      dockRoot: {
+        kind: "split" as const,
+        axis: "horizontal" as const,
+        ratio: 0.5,
+        first: {
+          kind: "split" as const,
+          axis: "vertical" as const,
+          ratio: 0.5,
+          first: { kind: "pane" as const, instanceId: "missing:main" },
+          second: { kind: "pane" as const, instanceId: "chat:main" },
+        },
+        second: { kind: "pane" as const, instanceId: "sectors:main" },
+      },
+      instances: [
+        createPaneInstance("missing-plugin", { instanceId: "missing:main" }),
+        createPaneInstance("chat", { instanceId: "chat:main" }),
+        createPaneInstance("sectors", { instanceId: "sectors:main" }),
+      ],
+      floating: [],
+      detached: [],
+    };
+
+    const next = gridlockAllPanes(layout, BOUNDS, new Set(["chat", "sectors"]));
+
+    expect(next.instances.map((instance) => instance.instanceId)).toEqual(["chat:main", "sectors:main"]);
+    expect(getDockedPaneIds(next)).toEqual(["chat:main", "sectors:main"]);
+    expect(getLeafRect(next, "missing:main", BOUNDS)).toBeNull();
+    expect(getLeafRect(next, "chat:main", BOUNDS)).toEqual({ x: 0, y: 0, width: 60, height: 40 });
+    expect(getLeafRect(next, "sectors:main", BOUNDS)).toEqual({ x: 60, y: 0, width: 60, height: 40 });
+  });
+
   test("gridlock infers a matching tiled layout from arranged windows", () => {
     const config = createDefaultConfig("/tmp/gloomberb-test");
     let layout: LayoutConfig = {

package/src/plugins/pane-manager.ts

@@ -49,7 +49,12 @@ export {
   swapPanes,
 } from "./pane-manager/docking";
 
-export { removeFloatingPanes, removePane } from "./pane-manager/layout-state";
+export {
+  removeFloatingPanes,
+  removePane,
+  removeUnavailablePaneTypes,
+  type PaneTypeAvailability,
+} from "./pane-manager/layout-state";
 export { gridlockAllPanes } from "./pane-manager/gridlock";
 export type {
   DropTarget,

package/src/plugins/prediction-markets/chart.tsx

@@ -72,12 +72,14 @@ export function PredictionMarketChart({
   history,
   width,
   height,
+  loading = false,
   range,
   onRangeSelect,
 }: {
   history: PredictionHistoryPoint[];
   width: number;
   height: number;
+  loading?: boolean;
   range: PredictionHistoryRange;
   onRangeSelect: (range: PredictionHistoryRange) => void;
 }) {
@@ -93,10 +95,14 @@ export function PredictionMarketChart({
           />
         </Box>
         <Box flexGrow={1} justifyContent="center">
-          <EmptyState
-            title="No chart history."
-            hint="This venue did not return price history for the selected market."
-          />
+          {loading ? (
+            <Text fg={colors.textDim}>Loading chart...</Text>
+          ) : (
+            <EmptyState
+              title="No chart history."
+              hint="This venue did not return price history for the selected market."
+            />
+          )}
         </Box>
       </Box>
     );