gloomberb 0.15.2 → 0.15.4

package/src/plugins/builtin/changelog/index.tsx

@@ -1,23 +1,22 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from "react";
-import { Box, ScrollBox, Text, TextAttributes, type ScrollBoxRenderable } from "../../../ui";
-import { useShortcut } from "../../../react/input";
+import { Box, Text, TextAttributes, type ScrollBoxRenderable } from "../../../ui";
 import { usePaneInstance } from "../../../state/app/context";
 import {
   DataTableStackView,
+  DetailScrollBody,
   PaneStatusBody,
   useExternalLinkFooter,
   type DataTableCell,
   type DataTableColumn,
-  type DataTableKeyEvent,
-  type PaneFooterSegment,
 } from "../../../components";
 import { MarkdownText } from "../../../components/markdown-text";
+import { loadingErrorFooterInfo, usePaneRefreshKey } from "../../../components/data-table/table-pane";
 import { fetchChangelogReleases, type ChangelogRelease } from "../../../updater/github-releases";
 import { colors } from "../../../theme/colors";
 import type { PaneProps } from "../../../types/plugin";
 import type { PluginModule } from "../plugin-module";
 import { usePluginPaneState } from "../../runtime";
-import { isPlainKey } from "../../../utils/keyboard";
+import { formatShortDate } from "../../../utils/datetime-format";
 import {
   DEFAULT_CHANGELOG_SORT,
   nextChangelogSortPreference,
@@ -31,23 +30,13 @@ const CHANGELOG_LIMIT = 40;
 const CHANGELOG_TIMEOUT_MS = 5_000;
 const CHANGELOG_CACHE_TTL_MS = 10 * 60 * 1000;
 
-// ponytail: process-lifetime cache, move into the updater module if other
+// Process-lifetime cache. Move it into the updater module if other
 // surfaces start reading releases too.
 let cachedReleases: { releases: ChangelogRelease[]; fetchedAt: number } | null = null;
 
 type ChangelogColumn = DataTableColumn & { id: ChangelogColumnId };
 type LoadStatus = "loading" | "loaded" | "error";
 
-function formatReleaseDate(value: string): string {
-  const timestamp = Date.parse(value);
-  if (!Number.isFinite(timestamp)) return "";
-  return new Date(timestamp).toLocaleDateString("en-US", {
-    month: "short",
-    day: "numeric",
-    year: "numeric",
-  });
-}
-
 function buildColumns(releases: ChangelogRelease[]): ChangelogColumn[] {
   const dateWidth = 12;
   const versionWidth = Math.min(
@@ -79,30 +68,13 @@ function ChangelogDetail({
   const lineWidth = Math.max(width - 2, 12);
 
   return (
-    <Box
-      flexDirection="column"
-      flexGrow={1}
-      flexBasis={0}
-      minHeight={0}
-      overflow="hidden"
-      paddingX={1}
-      paddingY={1}
-    >
-      <ScrollBox
-        ref={scrollRef}
-        flexGrow={1}
-        flexBasis={0}
-        minHeight={0}
-        scrollY
-        focusable={false}
-      >
-        <Box flexDirection="column" width={lineWidth}>
-          {/* The stack title already carries the version. */}
-          <Text fg={colors.textMuted}>{formatReleaseDate(release.publishedAt)}</Text>
-          <MarkdownText text={release.body} lineWidth={lineWidth} />
-        </Box>
-      </ScrollBox>
-    </Box>
+    <DetailScrollBody ref={scrollRef} resetScrollKey={release.id}>
+      <Box flexDirection="column" width={lineWidth}>
+        {/* The stack title already carries the version. */}
+        <Text fg={colors.textMuted}>{formatShortDate(release.publishedAt, { fallback: "" })}</Text>
+        <MarkdownText text={release.body} lineWidth={lineWidth} />
+      </Box>
+    </DetailScrollBody>
   );
 }
 
@@ -207,73 +179,30 @@ function ChangelogPane({ focused, width, height }: PaneProps) {
     setOpenReleaseId(match.id);
   }, [releases, requestedVersion]);
 
-  useEffect(() => {
-    if (!openReleaseId) return;
-    const scrollBox = detailScrollRef.current;
-    if (scrollBox) scrollBox.scrollTop = 0;
-  }, [openReleaseId]);
-
-  useShortcut((event) => {
-    if (!focused || !isPlainKey(event, "r")) return;
-    event.stopPropagation?.();
-    event.preventDefault?.();
-    void loadReleases(true);
-  });
+  usePaneRefreshKey(() => void loadReleases(true), { focused });
 
   const columns = useMemo(() => buildColumns(releases), [releases]);
 
-  const scrollDetailBy = useCallback((delta: number) => {
-    const scrollBox = detailScrollRef.current;
-    if (!scrollBox?.viewport) return;
-    const maxScrollTop = Math.max(
-      0,
-      scrollBox.scrollHeight - scrollBox.viewport.height,
-    );
-    scrollBox.scrollTop = Math.max(
-      0,
-      Math.min(maxScrollTop, scrollBox.scrollTop + delta),
-    );
-  }, []);
-
-  const handleDetailKeyDown = useCallback((event: DataTableKeyEvent) => {
-    if (isPlainKey(event, "j", "down")) {
-      event.stopPropagation?.();
-      event.preventDefault?.();
-      scrollDetailBy(1);
-      return true;
-    }
-    if (isPlainKey(event, "k", "up")) {
-      event.stopPropagation?.();
-      event.preventDefault?.();
-      scrollDetailBy(-1);
-      return true;
-    }
-    return false;
-  }, [scrollDetailBy]);
-
   const renderCell = useCallback((
     release: ChangelogRelease,
     column: ChangelogColumn,
-    _index: number,
-    rowState: { selected: boolean },
   ): DataTableCell => {
-    const selectedColor = rowState.selected ? colors.selectedText : undefined;
     switch (column.id) {
       case "date":
         return {
-          text: formatReleaseDate(release.publishedAt),
-          color: selectedColor ?? colors.textDim,
+          text: formatShortDate(release.publishedAt, { fallback: "" }),
+          color: colors.textDim,
         };
       case "version":
         return {
           text: release.version,
-          color: selectedColor ?? colors.textBright,
+          color: colors.textBright,
           attributes: TextAttributes.BOLD,
         };
       case "title":
         return {
           text: release.title,
-          color: selectedColor ?? colors.text,
+          color: colors.text,
         };
     }
   }, []);
@@ -286,22 +215,10 @@ function ChangelogPane({ focused, width, height }: PaneProps) {
     setSelectedReleaseId(release.id);
   }, []);
 
-  const footerInfo = useMemo<PaneFooterSegment[]>(() => {
-    const segments: PaneFooterSegment[] = [];
-    if (status === "loading") {
-      segments.push({
-        id: "loading",
-        parts: [{ text: "loading", tone: "muted" }],
-      });
-    }
-    if (status === "error") {
-      segments.push({
-        id: "error",
-        parts: [{ text: "error", tone: "warning" }],
-      });
-    }
-    return segments;
-  }, [status]);
+  const footerInfo = useMemo(
+    () => loadingErrorFooterInfo(status === "loading", status === "error" ? "error" : null),
+    [status],
+  );
 
   // The stack title names the release, so the footer offers only [o]pen.
   useExternalLinkFooter({
@@ -343,7 +260,7 @@ function ChangelogPane({ focused, width, height }: PaneProps) {
         onChange: (_id, release) => selectRelease(release),
       }}
       onActivate={(release) => setOpenReleaseId(release.id)}
-      onDetailKeyDown={handleDetailKeyDown}
+      detailScrollRef={detailScrollRef}
       rootWidth={width}
       rootHeight={height}
       columns={columns}
@@ -353,6 +270,7 @@ function ChangelogPane({ focused, width, height }: PaneProps) {
       onHeaderClick={handleHeaderClick}
       getItemKey={(release) => release.id}
       renderCell={renderCell}
+      selectedTextOverridesCellColor
       emptyStateTitle="No changelog entries."
       showHorizontalScrollbar={false}
     />

package/src/plugins/builtin/changelog/model.ts

@@ -1,5 +1,5 @@
 import type { ChangelogRelease } from "../../../updater/github-releases";
-import type { SortDirection } from "../../../utils/sort-values";
+import { nextHeaderSort, type SortDirection } from "../../../utils/sort-values";
 
 export type ChangelogColumnId = "date" | "version" | "title";
 
@@ -73,17 +73,7 @@ export function nextChangelogSortPreference(
   columnId: string,
 ): ChangelogSortPreference {
   if (!isChangelogColumnId(columnId)) return current;
-  const nextColumnId = columnId;
-  if (current.columnId !== nextColumnId) {
-    return {
-      columnId: nextColumnId,
-      direction: defaultDirection(nextColumnId),
-    };
-  }
-  return {
-    columnId: nextColumnId,
-    direction: current.direction === "asc" ? "desc" : "asc",
-  };
+  return nextHeaderSort(current, columnId, { firstDirection: defaultDirection });
 }
 
 export function resolveSelectedReleaseIndex(

package/src/plugins/builtin/chart-composer/catalog-inventory.ts

@@ -1,3 +1,4 @@
+import { fredSeriesUrl } from "../../../data/fred-series";
 import { resolveAssetDisplayKind } from "../../../market-data/market/format";
 import {
   getTimeSeriesField,
@@ -323,7 +324,7 @@ const buildStaticCatalogInventory = (): readonly CatalogSeriesRow[] => [
     sourceId: "fred",
     kind: "Economic",
     expression: `FRED:${entry.seriesId}`,
-    url: `https://fred.stlouisfed.org/series/${entry.seriesId}`,
+    url: fredSeriesUrl(entry.seriesId),
   })),
   ...TREASURY_MATURITIES.map((entry) => row({
     id: `ust:${entry.maturity}`,
@@ -332,7 +333,7 @@ const buildStaticCatalogInventory = (): readonly CatalogSeriesRow[] => [
     sourceId: "treasury",
     kind: "Treasury",
     expression: `UST:${entry.maturity}`,
-    url: `https://fred.stlouisfed.org/series/${entry.seriesId}`,
+    url: fredSeriesUrl(entry.seriesId),
   })),
   ...VALUATION_INDICATORS.map((entry) => row({
     id: `valuation:${entry.id}`,

package/src/plugins/builtin/chart-composer/chart-spec.ts

@@ -6,6 +6,7 @@ import {
   normalizeChartSpec,
   validateChartSpec,
 } from "../../../time-series/spec";
+import { isRecord } from "../../../utils/guards";
 
 export const CHART_SPEC_SETTING_KEY = "chartSpec";
 export const CHART_INTERACTION_VIEWPORT_SETTING_KEY = "chartInteractionViewport";
@@ -93,10 +94,6 @@ function decodeSpec(value: unknown): unknown {
   }
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
 function canMigrateV1(decoded: Record<string, unknown>): boolean {
   return !Array.isArray(decoded.series) || decoded.series.every((entry) => {
     const source = isRecord(entry) && isRecord(entry.source) ? entry.source : null;

package/src/plugins/builtin/chart-composer/data-catalog-pane.tsx

@@ -1,10 +1,10 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Box, type InputRenderable } from "../../../ui";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { Box } from "../../../ui";
 import {
   DataTableView,
   QueryBar,
-  Tabs,
-  usePaneHeaderTabs,
+  usePaneTabs,
+  useQueryBarSearch,
   type DataTableCell,
   type DataTableColumn,
   type DataTableKeyEvent,
@@ -12,13 +12,11 @@ import {
 } from "../../../components";
 import type { PaneProps } from "../../../types/plugin";
 import { colors } from "../../../theme/colors";
-import { compareSortValues, type SortDirection } from "../../../utils/sort-values";
-import { useShortcut } from "../../../react/input";
-import { isPlainKey } from "../../../utils/keyboard";
+import { compareSortValues, nextHeaderSort, type SortDirection } from "../../../utils/sort-values";
 import { isPlainArrowUp, stopSearchFocusNavigation } from "../../../utils/search-focus-navigation";
 import { usePaneSettingValue } from "../../../state/app/context";
 import { usePluginAppActions, usePluginPaneState } from "../../runtime";
-import { usePaneStatusLinkFooter } from "../shared/pane-footer";
+import { usePaneStatusLinkFooter } from "../../../components/layout/pane/status-footer";
 import { PaneTemplateInputStep } from "../../../components/pane-template-wizard";
 import { type PromptContext, useDialog } from "../../../ui/dialog";
 import {
@@ -47,16 +45,6 @@ interface CatalogSortPreference {
 
 const DEFAULT_SORT: CatalogSortPreference = { columnId: "publisher", direction: "asc" };
 
-function nextSortPreference(
-  current: CatalogSortPreference,
-  columnId: string,
-): CatalogSortPreference {
-  const typed = columnId as CatalogColumnId;
-  if (current.columnId !== typed) return { columnId: typed, direction: "asc" };
-  if (current.direction === "asc") return { columnId: typed, direction: "desc" };
-  return DEFAULT_SORT;
-}
-
 function sortValue(columnId: CatalogColumnId, row: CatalogSeriesRow): string | null {
   switch (columnId) {
     case "series":
@@ -91,9 +79,7 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
   const [filter, setFilter] = usePluginPaneState<CatalogFilterId>("activeTab", "all");
   const [selectedId, setSelectedId] = usePluginPaneState<string | null>("selectedId", null);
   const [sortPreference, setSortPreference] = useState<CatalogSortPreference>(DEFAULT_SORT);
-  const [searchFocused, setSearchFocused] = useState(false);
-  const [searchFocusToken, setSearchFocusToken] = useState(0);
-  const searchInputRef = useRef<InputRenderable | null>(null);
+  const { active: searchFocused, focus: focusSearch, searchProps } = useQueryBarSearch();
 
   const tickerQuery = looksLikeCatalogTickerQuery(searchQuery);
   const { instruments, loading: universeLoading } = useCatalogUniverse(
@@ -135,14 +121,6 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
 
   const columns = useMemo(() => buildColumns(width), [width]);
 
-  const focusSearch = useCallback(() => {
-    setSearchFocused(true);
-    setSearchFocusToken((token) => token + 1);
-  }, []);
-  const blurSearch = useCallback(() => {
-    setSearchFocused(false);
-  }, []);
-
   const chartSelected = useCallback(async (row: CatalogSeriesRow | null) => {
     if (!row) return;
     if (row.needsTicker) {
@@ -172,25 +150,7 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
     createPaneFromTemplate(CHART_COMPOSER_TEMPLATE_ID, { arg: row.expression });
   }, [createPaneFromTemplate, dialog]);
 
-  useShortcut((event) => {
-    if (!focused || searchFocused || event.targetEditable) return;
-    if (isPlainKey(event, "/")) {
-      event.preventDefault?.();
-      event.stopPropagation?.();
-      focusSearch();
-    }
-  }, { enabled: focused && !searchFocused });
-
-  useShortcut((event) => {
-    if (!focused || searchFocused || event.targetEditable) return;
-    if (isPlainKey(event, "g") && selectedRow) {
-      event.preventDefault?.();
-      event.stopPropagation?.();
-      chartSelected(selectedRow);
-    }
-  }, { enabled: focused && !searchFocused && !!selectedRow });
-
-  // `/` and `g` are the pane's own plain-key shortcuts above; the table only
+  // `/` and `g` are footer hints, which bind their own keys; the table only
   // hands the cursor up into the search from its first row.
   const handleRootKeyDown = useCallback((
     event: DataTableKeyEvent,
@@ -207,19 +167,16 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
   const renderCell = useCallback((
     row: CatalogSeriesRow,
     column: CatalogColumn,
-    _index: number,
-    rowState: { selected: boolean },
   ): DataTableCell => {
-    const selectedColor = rowState.selected ? colors.selectedText : undefined;
     switch (column.id) {
       case "series":
-        return { text: row.label, color: selectedColor ?? colors.textBright };
+        return { text: row.label, color: colors.textBright };
       case "publisher":
-        return { text: row.publisher, color: selectedColor ?? colors.textMuted };
+        return { text: row.publisher, color: colors.textMuted };
       case "kind":
-        return { text: row.kind, color: selectedColor ?? colors.textDim };
+        return { text: row.kind, color: colors.textDim };
       case "expression":
-        return { text: row.expression, color: selectedColor ?? colors.text };
+        return { text: row.expression, color: colors.text };
     }
   }, []);
 
@@ -242,11 +199,12 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
     [],
   );
   const selectFilter = useCallback((value: string) => setFilter(value as CatalogFilterId), [setFilter]);
-  const tabsInHeader = usePaneHeaderTabs({
+  const { strip: tabStrip } = usePaneTabs({
     tabs,
     activeValue: filter,
     onSelect: selectFilter,
     focused: focused && !searchFocused,
+    compact: true,
   });
 
   return (
@@ -263,23 +221,11 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
               onChange: setSearchQuery,
               placeholder: "series or expression",
               focused,
-              active: searchFocused,
-              onActiveChange: (active) => (active ? focusSearch() : blurSearch()),
-              focusToken: searchFocusToken,
-              inputRef: searchInputRef,
+              ...searchProps,
               debounceMs: 80,
-              onNavigateDown: blurSearch,
             }}
           />
-          {!tabsInHeader && (
-            <Tabs
-              tabs={tabs}
-              activeValue={filter}
-              onSelect={selectFilter}
-              focused={focused && !searchFocused}
-              compact
-            />
-          )}
+          {tabStrip}
         </Box>
       )}
       selection={{
@@ -293,10 +239,13 @@ export function DataCatalogPane({ focused, width, height }: PaneProps) {
       items={rows}
       sortColumnId={sortPreference.columnId}
       sortDirection={sortPreference.direction}
-      onHeaderClick={(columnId) => setSortPreference((current) => nextSortPreference(current, columnId))}
+      onHeaderClick={(columnId) => setSortPreference((current) => nextHeaderSort(current, columnId as CatalogColumnId, {
+        resetTo: DEFAULT_SORT,
+      }))}
       getItemKey={(row) => row.id}
       onActivate={chartSelected}
       renderCell={renderCell}
+      selectedTextOverridesCellColor
       emptyStateTitle={emptyCopy.title}
       emptyStateHint={emptyCopy.hint}
     />

package/src/plugins/builtin/chart-composer/editor/controller.ts

@@ -49,11 +49,7 @@ import {
   supportsSeriesTimestampMode,
   titleCaseSeriesEditorValue,
 } from "./model";
-
-function clampIndex(value: number, length: number): number {
-  if (length <= 0) return -1;
-  return Math.max(0, Math.min(value, length - 1));
-}
+import { clampIndex } from "../../../../utils/math";
 
 function seriesFieldId(series: ChartSeriesSpec): string {
   return series.source.kind === "security" ? series.source.fieldId : series.source.seriesId;
@@ -106,7 +102,7 @@ export function useSeriesEditorController({
   isDesktop: boolean;
 }) {
   const [draft, setDraft] = useState(() => parseChartSpecOr(initialSpec, buildEmptyChartPreset()));
-  const [selectedIndex, setSelectedIndex] = useState(() => clampIndex(0, initialSpec.series.length));
+  const [selectedIndex, setSelectedIndex] = useState(() => clampIndex(0, initialSpec.series.length, -1));
   const [expression, setExpression] = useState(() => initialSpec.series[0] ? formatSeriesExpression(initialSpec.series[0]) : "");
   const [editingExpression, setEditingExpression] = useState(false);
   const [quickAddActive, setQuickAddActive] = useState(true);
@@ -209,7 +205,7 @@ export function useSeriesEditorController({
   // Plugin catalogs land after the securities: only pull a stranded cursor
   // back into range, so a row the user already moved to stays selected.
   useEffect(() => {
-    setQuickAddSelection((current) => clampIndex(current, quickAddSuggestions.length));
+    setQuickAddSelection((current) => clampIndex(current, quickAddSuggestions.length, -1));
   }, [quickAddSuggestions.length]);
 
   useEffect(() => {
@@ -329,11 +325,11 @@ export function useSeriesEditorController({
   };
 
   const moveQuickAddSelection = (delta: -1 | 1) => {
-    setQuickAddSelection((current) => clampIndex(current + delta, quickAddSuggestions.length));
+    setQuickAddSelection((current) => clampIndex(current + delta, quickAddSuggestions.length, -1));
   };
 
   const submitQuickAdd = () => {
-    addCatalogSuggestion(quickAddSuggestions[clampIndex(quickAddSelection, quickAddSuggestions.length)]);
+    addCatalogSuggestion(quickAddSuggestions[clampIndex(quickAddSelection, quickAddSuggestions.length, -1)]);
   };
 
   const leaveQuickAdd = () => {
@@ -348,7 +344,7 @@ export function useSeriesEditorController({
       ...current,
       series: current.series.filter((_, index) => index !== selectedIndex),
     }));
-    setSelectedIndex((current) => clampIndex(current, draft.series.length - 1));
+    setSelectedIndex((current) => clampIndex(current, draft.series.length - 1, -1));
     setError(null);
   };
 
@@ -540,9 +536,9 @@ export function useSeriesEditorController({
     if (event.name === "tab") {
       moveKeyboardFocus(event.shift ? -1 : 1);
     } else if (keyboardFocusRef.current === "series" && isPlainKey(event, "up", "k")) {
-      setSelectedIndex((current) => clampIndex(current - 1, draft.series.length));
+      setSelectedIndex((current) => clampIndex(current - 1, draft.series.length, -1));
     } else if (keyboardFocusRef.current === "series" && isPlainKey(event, "down", "j")) {
-      setSelectedIndex((current) => clampIndex(current + 1, draft.series.length));
+      setSelectedIndex((current) => clampIndex(current + 1, draft.series.length, -1));
     } else if (event.name === "[") {
       moveSeries(-1);
     } else if (event.name === "]") {

package/src/plugins/builtin/chart-composer/editor.tsx

@@ -1,4 +1,4 @@
-import { Box, Text, useNativeRenderer, useUiHost } from "../../../ui";
+import { Box, Text, useNativeRenderer, useUiCapabilities } from "../../../ui";
 import { DialogFrame, ListView, TextField } from "../../../components/ui";
 import type { PromptContext } from "../../../ui/dialog";
 import { colors } from "../../../theme/colors";
@@ -19,7 +19,7 @@ export interface SeriesEditorDialogProps extends PromptContext<ChartSpec | null>
 }
 
 export function SeriesEditorDialog({ dialogId, resolve, initialSpec }: SeriesEditorDialogProps) {
-  const isDesktop = useUiHost().kind === "desktop-web";
+  const isDesktop = useUiCapabilities().nativePaneChrome === true;
   const nativeRenderer = useNativeRenderer();
   const controller = useSeriesEditorController({
     dialogId,

package/src/plugins/builtin/chart-composer/follow-binding.ts

@@ -2,6 +2,7 @@ import type { InstrumentRef } from "../../../market-data/request-types";
 import type { ChartSpec } from "../../../time-series/types";
 import { canonicalExchange, parsePublicTickerKey, publicTickerKey } from "../../../utils/exchanges";
 import { instrumentIdentityKey } from "../../../utils/instrument-identity";
+import { isSameFuturesGeneric } from "../../../utils/futures-generic";
 import { rebindChartSecuritySymbol, rebindResearchChartSpec } from "./presets";
 
 export const CHART_FOLLOW_SERIES_SETTING_KEY = "chartFollowSeriesIds";
@@ -56,9 +57,13 @@ export function rebindFollowChartSpec(
 ): ChartSpec {
   if (!target) return spec;
   const next = normalized(target);
+  // The Roll and Adjust controls rewrite a generic (CL1 to CL1F5R): it keeps
+  // following an unchanged target and moves on only when the target does.
+  const unchanged = !previous || key(normalized(previous)) === key(next);
   let changed = false;
   const series = spec.series.map(series => {
-    if (series.source.kind !== "security" || !ownedIds.includes(series.id) || key(series.source.instrument) === key(next)) {
+    if (series.source.kind !== "security" || !ownedIds.includes(series.id) || key(series.source.instrument) === key(next)
+      || (unchanged && isSameFuturesGeneric(normalized(series.source.instrument), next))) {
       return series;
     }
     changed = true;

package/src/plugins/builtin/chart-composer/index.tsx

@@ -42,7 +42,8 @@ import type { PluginModule } from "../plugin-module";
 import {
   LIVE_STREAMING_QUICK_SETTING,
   withLiveStreamingSetting,
-} from "../shared/live-streaming";
+} from "../../../state/hooks/live-streaming";
+import { isRecord } from "../../../utils/guards";
 
 function normalizedSymbol(value: string | null | undefined): string | null {
   const symbol = value?.trim().toUpperCase() ?? "";
@@ -109,10 +110,6 @@ function chartTitle(spec: ChartSpec, prefix = "G"): string {
   return `${prefix} ${labels.join(" · ")}${remaining > 0 ? ` +${remaining}` : ""}`;
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
 /**
  * A series authored as a bare symbol resolves its venue through the sender's
  * ticker records at render time. Those records do not travel, so the venue is
@@ -194,6 +191,7 @@ function selectedInstanceFor(spec: ChartSpec, prefix: string, context: PaneTempl
 function securityTemplate({
   id,
   prefix,
+  aliases,
   label,
   description,
   argKind,
@@ -202,6 +200,7 @@ function securityTemplate({
 }: {
   id: Parameters<typeof chartHeadless>[0];
   prefix: "GP" | "GIP" | "CMP" | "GF" | "GE";
+  aliases?: readonly string[];
   label: string;
   description: string;
   argKind: "ticker" | "ticker-list";
@@ -217,6 +216,7 @@ function securityTemplate({
     keywords: ["chart", "graph", prefix.toLowerCase(), ...label.toLowerCase().split(" ")],
     shortcut: {
       prefix,
+      ...(aliases ? { aliases } : {}),
       argPlaceholder: argKind === "ticker" ? "ticker" : "tickers",
       argKind,
     },
@@ -368,6 +368,7 @@ const chartComposerTemplates: PaneTemplateDef[] = [
   securityTemplate({
     id: "comparison-chart-pane",
     prefix: "CMP",
+    aliases: ["COMP", "TRA"],
     label: "Comparison Chart",
     description: "Compare price returns over shared observation dates for two or more tickers.",
     argKind: "ticker-list",
@@ -432,7 +433,3 @@ export const chartComposerModule: PluginModule = {
     });
   },
 };
-
-export * from "./chart-spec";
-export * from "./presets";
-export * from "./settings";