@opengeni/react 4.6.1 → 4.6.2-canary.39854174564001

package/dist/timeline/connector-logo-index.d.ts

@@ -0,0 +1,19 @@
+/** The catalog fields that name a connector's domains and logo. */
+export type ConnectorLogoSource = {
+    providerDomain?: string | null | undefined;
+    mcpUrl?: string | null | undefined;
+    connectionRef?: {
+        providerDomain?: string | null | undefined;
+    } | null | undefined;
+    logoAssetPath?: string | null | undefined;
+};
+/** "WWW.Linear.app " → "linear.app". */
+export declare function normalizeConnectorDomain(domain: string): string;
+/**
+ * Every domain each catalog entry is known by, mapped to its logo URL. The
+ * provider's own domain is claimed first across the whole catalog, so another
+ * entry's server host never takes over a provider's logo.
+ */
+export declare function connectorLogoIndex(catalog: readonly ConnectorLogoSource[], logoUrl: (logoAssetPath: string | null | undefined) => string | null | undefined): ReadonlyMap<string, string>;
+/** The logo for a connector domain from an index built by `connectorLogoIndex`. */
+export declare function connectorLogo(index: ReadonlyMap<string, string>, domain: string | null | undefined): string | null;

package/dist/{timeline-annotation-markers-OJYKHBEO.js → timeline-annotation-markers-NDHS7MCK.js}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-TXS65BB2.js";
 import {
   useOpenGeniText
-} from "./chunk-S6WJ6TUT.js";
+} from "./chunk-ZEVJGMNB.js";
 
 // src/components/timeline-annotation-markers.tsx
 import { useLayoutEffect, useState } from "react";
@@ -173,4 +173,4 @@ export {
   TimelineAnnotationMarkers,
   timeline_annotation_markers_default as default
 };
-//# sourceMappingURL=timeline-annotation-markers-OJYKHBEO.js.map
+//# sourceMappingURL=timeline-annotation-markers-NDHS7MCK.js.map

package/dist/{timeline-annotation-selection-6OAZLXFU.js → timeline-annotation-selection-DRQSTJOV.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-XEA5BCMA.js";
 import {
   useOpenGeniText
-} from "./chunk-S6WJ6TUT.js";
+} from "./chunk-ZEVJGMNB.js";
 
 // src/components/timeline-annotation-selection.tsx
 import { QuoteIcon } from "lucide-react";
@@ -201,4 +201,4 @@ export {
   TimelineAnnotationSelection,
   timeline_annotation_selection_default as default
 };
-//# sourceMappingURL=timeline-annotation-selection-6OAZLXFU.js.map
+//# sourceMappingURL=timeline-annotation-selection-DRQSTJOV.js.map

package/dist/{timeline-annotations-dialog-5M6DP5FX.js → timeline-annotations-dialog-G6J5ZJKN.js}

@@ -4,7 +4,7 @@ import {
   AnnotationNoteField,
   AnnotationNotePreview,
   AnnotationQuoteSourceButton
-} from "./chunk-QLDMF7MH.js";
+} from "./chunk-LC5HE7PZ.js";
 import {
   cssEscapeAttribute
 } from "./chunk-H3LIIAGE.js";
@@ -25,7 +25,7 @@ import {
 import "./chunk-TXS65BB2.js";
 import {
   useOpenGeniText
-} from "./chunk-S6WJ6TUT.js";
+} from "./chunk-ZEVJGMNB.js";
 
 // src/components/timeline-annotations-dialog.tsx
 import { XIcon } from "lucide-react";
@@ -280,4 +280,4 @@ export {
   TimelineAnnotationsDialog,
   timeline_annotations_dialog_default as default
 };
-//# sourceMappingURL=timeline-annotations-dialog-5M6DP5FX.js.map
+//# sourceMappingURL=timeline-annotations-dialog-G6J5ZJKN.js.map

package/dist/timeline-model.d.ts

@@ -4,6 +4,8 @@ export { clusterIsSettled, compactedLandmarkCount, durationBetween, flattenActiv
 export type { ActivityGroup, ReadableWorkOptions, TurnGroup } from "./timeline/work-presentation.js";
 export { timelineGroupContainsPresentedImage } from "./timeline/presented-image.js";
 export { mcpToolLeaf, toolDisplayName } from "./timeline/tool-display-name.js";
+export { connectorLogo, connectorLogoIndex, normalizeConnectorDomain, } from "./timeline/connector-logo-index.js";
+export type { ConnectorLogoSource } from "./timeline/connector-logo-index.js";
 export { BUILT_IN_TOOL_STEP_NAMES, builtInToolStep, builtInToolStepLabel, TOOL_STEP_IDS, toolStepLabel, toolStepPhase, } from "./timeline/tool-steps.js";
 export type { ToolStepId, ToolStepPhase } from "./timeline/tool-steps.js";
 export { rawTypeOf } from "./timeline/registry.js";

package/dist/timeline-model.js

@@ -3,7 +3,12 @@ import {
   notificationPlainText,
   parseNotificationInline,
   parseNotificationText
-} from "./chunk-LY6727IF.js";
+} from "./chunk-PPSVFNEA.js";
+import {
+  connectorLogo,
+  connectorLogoIndex,
+  normalizeConnectorDomain
+} from "./chunk-GLCOKWLH.js";
 import {
   QUESTION_NAV_HIDDEN_PX,
   QUESTION_NAV_MARGIN_PX,
@@ -168,6 +173,8 @@ export {
   callStepPhase,
   clusterIsSettled,
   compactedLandmarkCount,
+  connectorLogo,
+  connectorLogoIndex,
   createTurnSummaryContext,
   defaultHumanInputFormMessages,
   durationBetween,
@@ -190,6 +197,7 @@ export {
   matchingQuoteInSource,
   mcpToolLeaf,
   namedAgentTitle,
+  normalizeConnectorDomain,
   noticeDisplayText,
   noticeIsResolvedApproval,
   noticeTone,

package/dist/ui/list-row.js

@@ -5,7 +5,7 @@ import {
   RowIndicator,
   RowList,
   useRowListVariant
-} from "../chunk-MM7OKOTE.js";
+} from "../chunk-UBXHP224.js";
 import "../chunk-FQQEZUSN.js";
 import "../chunk-ZMBJPN4T.js";
 import "../chunk-HY7EYWIG.js";

package/dist/usage.js

@@ -13,7 +13,7 @@ import {
   summarizeUsage,
   usagePercentLabel,
   useUsage
-} from "./chunk-7OIBLMDP.js";
+} from "./chunk-RAQISW42.js";
 import {
   DEFAULT_ALLOWANCE_LABELS,
   DEFAULT_SESSION_USAGE_LIMIT_LABELS,
@@ -30,7 +30,7 @@ import "./chunk-2KO2G3RI.js";
 import "./chunk-CM7LVUKC.js";
 import "./chunk-TVQCDDSZ.js";
 import "./chunk-TXS65BB2.js";
-import "./chunk-S6WJ6TUT.js";
+import "./chunk-ZEVJGMNB.js";
 export {
   DEFAULT_ALLOWANCE_LABELS,
   DEFAULT_SESSION_USAGE_LIMIT_LABELS,

package/dist/workbench.js

@@ -6,21 +6,21 @@ import {
   enableCodeEditor
 } from "./chunk-TOTNIUZK.js";
 import "./chunk-YSRBFJMQ.js";
-import "./chunk-SJPAKWWP.js";
+import "./chunk-2BISI664.js";
 import {
   enableDesktopViewer
 } from "./chunk-QIOARE4I.js";
-import "./chunk-WN2MIB4Q.js";
+import "./chunk-22V2QCEM.js";
 import "./chunk-ZUWF4NF7.js";
 import {
   enableSandboxTerminal
 } from "./chunk-FPS7ARET.js";
-import "./chunk-4XO346BW.js";
+import "./chunk-4FBJFQFU.js";
 import "./chunk-QV3DJVRZ.js";
 import "./chunk-TNEZNMSN.js";
 import "./chunk-5I4VRWBB.js";
 import "./chunk-TXS65BB2.js";
-import "./chunk-S6WJ6TUT.js";
+import "./chunk-ZEVJGMNB.js";
 
 // src/workbench.ts
 function enableWorkbench() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/react",
-  "version": "4.6.1",
+  "version": "4.6.2-canary.39854174564001",
   "description": "React hooks and styled components for Opengeni: live session streaming, chat composer, message timeline, session status, and fleet views — token-themed (CSS variables), dark-first, built on Tailwind v4 + Radix + Motion.",
   "license": "Apache-2.0",
   "repository": {
@@ -251,9 +251,9 @@
     "@dnd-kit/utilities": "3.2.2",
     "@fontsource-variable/noto-sans-arabic": "5.2.10",
     "@fontsource-variable/noto-sans-jp": "5.2.10",
-    "@opengeni/connect": "4.6.1",
-    "@opengeni/contracts": "4.6.1",
-    "@opengeni/sdk": "4.6.1",
+    "@opengeni/connect": "4.6.2-canary.39854174564001",
+    "@opengeni/contracts": "4.6.2-canary.39854174564001",
+    "@opengeni/sdk": "4.6.2-canary.39854174564001",
     "@tanstack/react-virtual": "^3.14.11",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

package/src/app/components/capabilities/native-connect-readiness.tsx

@@ -34,6 +34,7 @@ export function nativeCatalogProviderId(
   if (item.kind !== "mcp") return null;
   const url = item.mcpUrl ?? item.endpointUrl;
   if (url === "https://gmailmcp.googleapis.com/mcp/v1") return "gmail";
+  if (url === "https://drivemcp.googleapis.com/mcp/v1") return "google-drive";
   if (url === "https://mcp.slack.com/mcp") return "slack-personal";
   return null;
 }

package/src/app/components/capabilities/perform-capability-action.test.ts

@@ -270,3 +270,70 @@ describe("shared capability connection lifecycle", () => {
     });
   });
 });
+
+test("Drive actions use the dedicated Connect attempt and never generic OAuth or early enable", async () => {
+  const originalWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
+  const saved = new Map<string, string>();
+  Object.defineProperty(globalThis, "window", {
+    configurable: true,
+    value: {
+      location: { href: "https://app.example/capabilities" },
+      sessionStorage: {
+        setItem: (key: string, value: string) => saved.set(key, value),
+        getItem: (key: string) => saved.get(key) ?? null,
+        removeItem: (key: string) => saved.delete(key),
+      },
+    },
+  });
+  try {
+    const drive = CapabilityCatalogItem.parse({
+      ...item,
+      id: "drive",
+      authKind: "oauth2",
+      mcpUrl: "https://drivemcp.googleapis.com/mcp/v1",
+      providerDomain: "drivemcp.googleapis.com",
+    });
+    const beginConnect = mock(async () => ({
+      id: "drive-attempt",
+      revision: 1,
+      state: "credential_input",
+    }));
+    const advanceConnectAttempt = mock(async () => ({
+      id: "drive-attempt",
+      nextAction: { type: "authorize", url: "https://accounts.google.com/consent" },
+    }));
+    const startConnectionOAuth = mock(async () => {
+      throw new Error("Generic OAuth must not run");
+    });
+    const h = harness({
+      beginConnect,
+      connectTransport: () => ({ advance: advanceConnectAttempt }),
+      startConnectionOAuth,
+    });
+    await performCapabilityAction(
+      { ...h.options, item: drive, connectReturnUrl: "https://app.example/capabilities" },
+      {
+        type: "reconnect_oauth",
+        item: drive,
+        ownership: "personal",
+        connectionId: "existing",
+        connectionWorkspaceId: "account-workspace",
+      },
+    );
+    expect(beginConnect).toHaveBeenCalledWith(
+      "account-workspace",
+      expect.objectContaining({
+        providerId: "google-drive",
+        reconnectAccountId: "existing",
+        ownership: "personal",
+      }),
+    );
+    expect(startConnectionOAuth).not.toHaveBeenCalled();
+    expect(h.enableCapability).not.toHaveBeenCalled();
+    expect(h.options.redirect).toHaveBeenCalledWith("https://accounts.google.com/consent");
+    expect(saved.size).toBe(1);
+  } finally {
+    if (originalWindow) Object.defineProperty(globalThis, "window", originalWindow);
+    else Reflect.deleteProperty(globalThis, "window");
+  }
+});

package/src/app/components/capabilities/perform-capability-action.tsx

@@ -15,6 +15,7 @@ import {
   type IntegrationClass,
   type IntegrationConnectMethod,
 } from "../../lib/integration-connect-analytics";
+import { beginDriveConnect, DRIVE_MCP_URL } from "../../lib/drive-connect-return";
 import { startMcpOAuthWithTimeout } from "../../lib/mcp-oauth";
 import { toast } from "../../lib/toast";
 
@@ -132,6 +133,33 @@ async function performCapabilityActionUntracked(
     );
   }
 
+  // The built-in Drive action uses a server-owned Connect provider identity.
+  // Custom MCP requests continue through the generic OAuth route below.
+  if (
+    ["oauth", "add_oauth_account", "reconnect_oauth"].includes(action.type) &&
+    (item.mcpUrl ?? item.endpointUrl) === DRIVE_MCP_URL
+  ) {
+    if (!("ownership" in action) || action.ownership !== "personal")
+      throw new Error("Google Drive connections must be personal-owned.");
+    const persisted = await persistIfRegistry(item, registry);
+    const target = new URL(returnPathFor(persisted.id), connectReturnUrl ?? window.location.href);
+    const authorizationUrl = await beginDriveConnect({
+      client,
+      workspaceId,
+      itemId: persisted.id,
+      returnUrl: target.toString(),
+      ...(action.type === "reconnect_oauth" && action.connectionId
+        ? { reconnectAccountId: action.connectionId }
+        : {}),
+      ...(action.type === "reconnect_oauth" && action.connectionWorkspaceId
+        ? { connectionWorkspaceId: action.connectionWorkspaceId }
+        : {}),
+      storage: window.sessionStorage,
+    });
+    redirect(authorizationUrl);
+    return;
+  }
+
   if (action.type === "install_skill") {
     if (!canManageSkills) {
       throw new Error("You need permission to manage workspace documents to install Skills.");

package/src/app/components/command-menu/chat-switcher.tsx

@@ -5,7 +5,7 @@
  * Control (and the chat being switched to) behaves exactly as without it.
  */
 import { MessageSquareIcon, PinIcon, type LucideIcon } from "lucide-react";
-import { useEffect, useRef } from "react";
+import { Fragment, useEffect, useRef } from "react";
 import { createPortal } from "react-dom";
 import type { ChatRecord } from "../../lib/actions/chat-directory";
 import { readChatDirectory, useChatDirectoryVersion } from "../../lib/actions/chat-directory";
@@ -31,11 +31,13 @@ export default function ChatSwitcher(props: {
   currentChatId: string | null;
   platform: ChordPlatform;
   onHover(index: number): void;
+  /** The app learned about more chats; the list may grow at its end. */
+  onDirectoryChange(): void;
   onPick(index: number): void;
   onDismiss(): void;
 }) {
   const listRef = useRef<HTMLDivElement>(null);
-  const { index, visible } = props.state;
+  const { index, visible, viewed } = props.state;
   // Read statuses as soon as Control+Tab is pressed, before the list shows.
   useChatStatusRefresh({
     subjectId: props.subjectId,
@@ -43,7 +45,12 @@ export default function ChatSwitcher(props: {
     ids: props.state.ids,
     active: true,
   });
-  useChatDirectoryVersion(props.subjectId);
+  const version = useChatDirectoryVersion(props.subjectId);
+  const onDirectoryChange = useRef(props.onDirectoryChange);
+  onDirectoryChange.current = props.onDirectoryChange;
+  useEffect(() => {
+    onDirectoryChange.current();
+  }, [version]);
   useEffect(() => {
     if (!visible) return;
     listRef.current
@@ -100,7 +107,7 @@ export default function ChatSwitcher(props: {
               record && record.workspaceId !== props.workspaceId
                 ? (workspaceNames.get(record.workspaceId) ?? null)
                 : null;
-            return (
+            const row = (
               <div
                 key={id}
                 id={`og-chat-switcher-${position}`}
@@ -135,6 +142,20 @@ export default function ChatSwitcher(props: {
                 ) : null}
               </div>
             );
+            // Past the chats the person opened, the list goes on by activity.
+            return position === viewed && viewed > 0 ? (
+              <Fragment key={id}>
+                <div
+                  role="presentation"
+                  className="mt-1 border-t border-border px-2.5 pt-2.5 pb-1 text-xs leading-4.5 font-medium text-fg-muted"
+                >
+                  Recently active
+                </div>
+                {row}
+              </Fragment>
+            ) : (
+              row
+            );
           })}
         </div>
         <div className="flex shrink-0 items-center gap-4 border-t border-border px-4 py-2 text-xs text-fg-muted">

package/src/app/components/rail/session-header.test.tsx

@@ -316,8 +316,11 @@ test("names the model cleanly for org- and workspace-connected copies alike", as
       const text = container.querySelector("header")?.textContent ?? "";
       expect(text).toContain("Opus 5.5");
       expect(text).not.toContain("claude-subscription");
-      expect(container.querySelector('[data-model-vendor="anthropic"]')).not.toBeNull();
-      seen.push(container.querySelector("[data-model-vendor]")?.parentElement?.textContent ?? "");
+      const mark = container.querySelector(
+        '[data-testid="billing-class-icon-claude_subscription"]',
+      );
+      expect(mark).not.toBeNull();
+      seen.push(mark?.parentElement?.textContent ?? "");
     }
     expect(seen[0]).toBe(seen[1]);
   } finally {
@@ -325,3 +328,71 @@ test("names the model cleanly for org- and workspace-connected copies alike", as
     container.remove();
   }
 });
+
+// Bendik's report: a Claude chat showed a static Claude logo where a Codex chat
+// shows its account control. Every subscription rail gets the same control.
+test.each([
+  ["codex_subscription", "codex/gpt-6-astra"],
+  ["claude_subscription", "organization-claude-subscription/claude-opus-5-5"],
+  ["supergrok_subscription", "supergrok/grok-4.6"],
+] as const)("the %s header shows the account control", async (billingClass, model) => {
+  const container = document.createElement("div");
+  document.body.append(container);
+  const root = createRoot(container);
+  try {
+    await act(async () =>
+      root.render(
+        <SessionHeader
+          session={{ ...session, model }}
+          ancestors={[]}
+          connectionState="live"
+          status="idle"
+          keyAuthRequired={false}
+          onForgetAccessKey={() => undefined}
+          inspectorOpen={false}
+          onToggleInspector={() => undefined}
+          onRename={async () => null}
+          onPin={async () => null}
+          billingClass={billingClass}
+          accountSlot={<button type="button" data-testid="account-control" />}
+        />,
+      ),
+    );
+    expect(container.querySelector('[data-testid="account-control"]')).not.toBeNull();
+    expect(container.querySelector("[data-model-vendor]")).toBeNull();
+  } finally {
+    await act(async () => root.unmount());
+    container.remove();
+  }
+});
+
+test("other payment rails keep the maker's logo and never show an account control", async () => {
+  const container = document.createElement("div");
+  document.body.append(container);
+  const root = createRoot(container);
+  try {
+    await act(async () =>
+      root.render(
+        <SessionHeader
+          session={{ ...session, model: "opper/aws/claude-opus-5-5" }}
+          ancestors={[]}
+          connectionState="live"
+          status="idle"
+          keyAuthRequired={false}
+          onForgetAccessKey={() => undefined}
+          inspectorOpen={false}
+          onToggleInspector={() => undefined}
+          onRename={async () => null}
+          onPin={async () => null}
+          billingClass="opengeni_credits"
+          accountSlot={<button type="button" data-testid="account-control" />}
+        />,
+      ),
+    );
+    expect(container.querySelector('[data-testid="account-control"]')).toBeNull();
+    expect(container.querySelector('[data-model-vendor="anthropic"]')).not.toBeNull();
+  } finally {
+    await act(async () => root.unmount());
+    container.remove();
+  }
+});

package/src/app/components/rail/session-header.tsx

@@ -4,7 +4,7 @@
 // (breadcrumb → title) on the left and the action cluster on the right
 // (provider+model·effort·speed, sandbox, pin, connection, status, panel).
 // The live children that need their own hooks — the sandbox switcher and the
-// codex account indicator — arrive as slots so the whole bar can be rendered
+// subscription account control — arrive as slots so the whole bar can be rendered
 // (and screenshotted) in isolation. `CanvasTopStrip` in session-shell owns the
 // data wiring and passes the real slots.
 import { t } from "../../lib/console-text";
@@ -87,6 +87,12 @@ import type { LatencyMode, Session } from "../../types";
 import { usePage } from "../../lib/navigation";
 import { useUiEventTarget } from "../../lib/ui-events";
 
+const SUBSCRIPTION_RAILS: ReadonlySet<BillingClass> = new Set([
+  "codex_subscription",
+  "claude_subscription",
+  "supergrok_subscription",
+]);
+
 export function SessionHeader({
   session,
   ancestors,
@@ -106,7 +112,7 @@ export function SessionHeader({
   adminAccess,
   onOpenUsageLimit,
   sandboxSlot,
-  codexSlot,
+  accountSlot,
   accessSlot,
   leading,
   lastStartedModel,
@@ -156,10 +162,11 @@ export function SessionHeader({
   /** The "Run on <machine>" control — a live component in production. */
   sandboxSlot?: ReactNode | undefined;
   /**
-   * Replaces the static provider mark when the session is on Codex — same icon,
-   * clickable for account status/switch. Absent for host-credit sessions.
+   * Replaces the static provider mark when the session runs on a subscription
+   * (Codex, Claude, SuperGrok): the same mark, clickable for the account and
+   * its usage. Absent for other payment rails.
    */
-  codexSlot?: ReactNode | undefined;
+  accountSlot?: ReactNode | undefined;
   /** Compact session access state/menu, lazy-mounted by the route shell. */
   accessSlot?: ReactNode | undefined;
   /** Leading control (the mobile hamburger); absent on desktop. */
@@ -172,7 +179,7 @@ export function SessionHeader({
   lastStartedModel?: string | undefined;
   lastStartedReasoningEffort?: IntelligenceEffort | undefined;
   lastStartedLatencyMode?: LatencyMode | undefined;
-  /** Billing rail: Codex account chip, or the mark for makers without a logo. */
+  /** Billing rail: subscription account chip, or the mark for makers without a logo. */
   billingClass?: BillingClass | undefined;
   /** Product model label (e.g. GPT-5.6 Luna). */
   modelLabel?: string | undefined;
@@ -206,9 +213,10 @@ export function SessionHeader({
   const resolvedModel = modelLabel?.trim() || modelDisplayName(modelId);
   const displayEffort: IntelligenceEffort = lastStartedReasoningEffort ?? session.reasoningEffort;
   const displayLatency: LatencyMode = lastStartedLatencyMode ?? session.latencyMode;
-  // Codex → clickable account chip. Other rails → static provider icon only
-  // (never invent a text "Opengeni"/"BYOK" word). Don't key off `codexSlot != null`.
-  const isCodexRail = resolvedBilling === "codex_subscription";
+  // Subscription rails → clickable account chip, the same for every provider.
+  // Other rails → static provider icon only (never invent a text
+  // "Opengeni"/"BYOK" word). Don't key off `accountSlot != null`.
+  const isSubscriptionRail = SUBSCRIPTION_RAILS.has(resolvedBilling);
   const policyBits = [
     resolvedModel,
     labelEffort(displayEffort),
@@ -240,10 +248,10 @@ export function SessionHeader({
     uiEvents.addEventListener(RENAME_CURRENT_CHAT_EVENT, start);
     return () => uiEvents.removeEventListener(RENAME_CURRENT_CHAT_EVENT, start);
   }, [uiEvents, startRenaming]);
-  const providerControl = isCodexRail ? (
-    (codexSlot ?? (
+  const providerControl = isSubscriptionRail ? (
+    (accountSlot ?? (
       <BillingClassMark
-        billingClass="codex_subscription"
+        billingClass={resolvedBilling}
         className="size-3.5 shrink-0 text-fg-muted"
         aria-label=""
       />

package/src/app/components/rail/session-shell.tsx

@@ -51,8 +51,8 @@ import {
   SessionComputeIndicator,
   sessionSupportsFleetSwitching,
 } from "../session/sandbox-switcher";
-import { CodexAccountIndicator } from "../session/codex-account-indicator";
-import { ModelAccountIndicator } from "../session/model-account-indicator";
+import { SubscriptionAccountIndicator } from "../session/subscription-account-indicator";
+import { subscriptionAccountProvider } from "../session/subscription-account";
 import { PrivateSessionIndicator } from "../session/private-session-indicator";
 import { Button } from "../../../ui/button";
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from "../../../ui/sheet";
@@ -61,7 +61,6 @@ import { Link, useNavigate, useRouterState } from "../../lib/navigation";
 import { useWorkspaceModelCatalog } from "../../lib/use-workspace-model-catalog";
 import { useAppContext } from "../../app-context";
 import { isPersonalWorkspace } from "../../lib/managed-self-context";
-import { isCodexProductModel } from "../../lib/session-model";
 import { isIntelligenceEffort } from "../../lib/session-tools";
 import { useSessionRepliesMute } from "../../lib/inbox";
 import { useSessionAdminAccess } from "../session/session-admin-access";
@@ -548,9 +547,10 @@ function SessionRouteHeader({
   const catalog = useWorkspaceModelCatalog(session.workspaceId);
   const selectedRow = findPickerRow(catalog.rows, displayModelId);
   const policyLoading = lastStarted.loading || catalog.loading;
-  const credentialSource = selectedRow?.catalog.credentialSource;
-  const subscriptionProvider =
-    credentialSource?.kind === "connected_subscription" ? credentialSource.provider : null;
+  const accountProvider = subscriptionAccountProvider(
+    displayModelId,
+    selectedRow?.catalog.credentialSource,
+  );
   const repliesMute = useSessionRepliesMute(session);
   const sessionAdminAccess = useSessionAdminAccess(session);
   const adminAccess = useSessionUiFeature("adminAccess") ? sessionAdminAccess : null;
@@ -660,24 +660,16 @@ function SessionRouteHeader({
           <SessionComputeIndicator sessionId={session.id} sandboxBackend={session.sandboxBackend} />
         ) : null
       }
-      codexSlot={
-        policyReady && isCodexProductModel(displayModelId) ? (
-          <CodexAccountIndicator
-            workspaceId={session.workspaceId}
-            sessionId={session.id}
-            model={displayModelId}
-            modelReady={policyReady}
-            events={events}
-          />
-        ) : policyReady && subscriptionProvider ? (
-          <ModelAccountIndicator
+      accountSlot={
+        policyReady && accountProvider ? (
+          <SubscriptionAccountIndicator
             workspaceId={session.workspaceId}
             sessionId={session.id}
             organizationId={
               context.workspaces.find((candidate) => candidate.id === session.workspaceId)
                 ?.accountId ?? null
             }
-            provider={subscriptionProvider}
+            provider={accountProvider}
             servingTurnId={lastStarted.policy?.turnId}
             events={events}
           />