fix(account): use home workspace for sidebar controls

Author: mhulden

src/features/app/components/MainApp.tsx

@@ -717,95 +717,6 @@ export default function MainApp() {
     onDebug: addDebugEntry,
   });
 
-  const {
-    activeAccount,
-    accountSwitching,
-    savedProfiles,
-    savedProfilesLoading,
-    activatingProfileId,
-    handleSwitchAccount,
-    handleCancelSwitchAccount,
-    handleActivateSavedProfile,
-  } = useAccountSwitching({
-    activeWorkspaceId,
-    accountByWorkspace,
-    activeRateLimits,
-    refreshAccountInfo,
-    refreshAccountRateLimits,
-    alertError,
-  });
-  const handleResetUsageLimit = useCallback(async () => {
-    const workspaceId = activeWorkspaceId;
-    const availableCount = activeRateLimits?.rateLimitResetCredits?.availableCount ?? 0;
-    if (!workspaceId || availableCount <= 0 || resettingUsageLimit) {
-      return;
-    }
-
-    const confirmed = window.confirm(
-      "Use 1 reset credit to reset your Codex usage limit?",
-    );
-    if (!confirmed) {
-      return;
-    }
-
-    const idempotencyKey =
-      typeof crypto !== "undefined" && typeof crypto.randomUUID === "function"
-        ? crypto.randomUUID()
-        : `${Date.now()}-${Math.random().toString(36).slice(2)}`;
-
-    setResettingUsageLimit(true);
-    addDebugEntry({
-      id: `${Date.now()}-client-rate-limit-reset`,
-      timestamp: Date.now(),
-      source: "client",
-      label: "account/rateLimitResetCredit/consume",
-      payload: { workspaceId, idempotencyKey },
-    });
-
-    try {
-      const response = await consumeRateLimitResetCredit(workspaceId, idempotencyKey);
-      addDebugEntry({
-        id: `${Date.now()}-server-rate-limit-reset`,
-        timestamp: Date.now(),
-        source: "server",
-        label: "account/rateLimitResetCredit/consume response",
-        payload: response,
-      });
-      const result =
-        response?.result && typeof response.result === "object"
-          ? response.result
-          : response;
-      const outcome = typeof result?.outcome === "string" ? result.outcome : null;
-      if (outcome === "noCredit") {
-        alertError("No reset credits are available.");
-      } else if (outcome === "nothingToReset") {
-        alertError("There is no active usage limit to reset.");
-      }
-      await refreshAccountRateLimits(workspaceId);
-    } catch (error) {
-      addDebugEntry({
-        id: `${Date.now()}-client-rate-limit-reset-error`,
-        timestamp: Date.now(),
-        source: "error",
-        label: "account/rateLimitResetCredit/consume error",
-        payload: error instanceof Error ? error.message : String(error),
-      });
-      alertError(
-        error instanceof Error
-          ? `Reset failed: ${error.message}`
-          : "Reset failed.",
-      );
-    } finally {
-      setResettingUsageLimit(false);
-    }
-  }, [
-    activeRateLimits?.rateLimitResetCredits?.availableCount,
-    activeWorkspaceId,
-    addDebugEntry,
-    alertError,
-    refreshAccountRateLimits,
-    resettingUsageLimit,
-  ]);
   const {
     newAgentDraftWorkspaceId,
     startingDraftThreadWorkspaceId,
@@ -1146,6 +1057,7 @@ export default function MainApp() {
   });
 
   const {
+    homeAccountWorkspaceId,
     homeAccount,
     homeRateLimits,
   } = useHomeAccount({
@@ -1159,6 +1071,99 @@ export default function MainApp() {
     refreshAccountInfo,
     refreshAccountRateLimits,
   });
+  const accountWorkspaceId = activeWorkspace ? activeWorkspaceId : homeAccountWorkspaceId;
+  const accountWorkspaceRateLimits = activeWorkspace ? activeRateLimits : homeRateLimits;
+  const {
+    activeAccount,
+    accountSwitching,
+    savedProfiles,
+    savedProfilesLoading,
+    activatingProfileId,
+    handleSwitchAccount,
+    handleCancelSwitchAccount,
+    handleActivateSavedProfile,
+  } = useAccountSwitching({
+    activeWorkspaceId: accountWorkspaceId,
+    accountByWorkspace,
+    activeRateLimits: accountWorkspaceRateLimits,
+    refreshAccountInfo,
+    refreshAccountRateLimits,
+    alertError,
+  });
+  const resetUsageWorkspaceId = activeWorkspace ? activeWorkspaceId : homeAccountWorkspaceId;
+  const resetUsageRateLimits = activeWorkspace ? activeRateLimits : homeRateLimits;
+  const handleResetUsageLimit = useCallback(async () => {
+    const workspaceId = resetUsageWorkspaceId;
+    const availableCount = resetUsageRateLimits?.rateLimitResetCredits?.availableCount ?? 0;
+    if (!workspaceId || availableCount <= 0 || resettingUsageLimit) {
+      return;
+    }
+
+    const confirmed = window.confirm(
+      "Use 1 reset credit to reset your Codex usage limit?",
+    );
+    if (!confirmed) {
+      return;
+    }
+
+    const idempotencyKey =
+      typeof crypto !== "undefined" && typeof crypto.randomUUID === "function"
+        ? crypto.randomUUID()
+        : `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+
+    setResettingUsageLimit(true);
+    addDebugEntry({
+      id: `${Date.now()}-client-rate-limit-reset`,
+      timestamp: Date.now(),
+      source: "client",
+      label: "account/rateLimitResetCredit/consume",
+      payload: { workspaceId, idempotencyKey },
+    });
+
+    try {
+      const response = await consumeRateLimitResetCredit(workspaceId, idempotencyKey);
+      addDebugEntry({
+        id: `${Date.now()}-server-rate-limit-reset`,
+        timestamp: Date.now(),
+        source: "server",
+        label: "account/rateLimitResetCredit/consume response",
+        payload: response,
+      });
+      const result =
+        response?.result && typeof response.result === "object"
+          ? response.result
+          : response;
+      const outcome = typeof result?.outcome === "string" ? result.outcome : null;
+      if (outcome === "noCredit") {
+        alertError("No reset credits are available.");
+      } else if (outcome === "nothingToReset") {
+        alertError("There is no active usage limit to reset.");
+      }
+      await refreshAccountRateLimits(workspaceId);
+    } catch (error) {
+      addDebugEntry({
+        id: `${Date.now()}-client-rate-limit-reset-error`,
+        timestamp: Date.now(),
+        source: "error",
+        label: "account/rateLimitResetCredit/consume error",
+        payload: error instanceof Error ? error.message : String(error),
+      });
+      alertError(
+        error instanceof Error
+          ? `Reset failed: ${error.message}`
+          : "Reset failed.",
+      );
+    } finally {
+      setResettingUsageLimit(false);
+    }
+  }, [
+    addDebugEntry,
+    alertError,
+    refreshAccountRateLimits,
+    resetUsageRateLimits?.rateLimitResetCredits?.availableCount,
+    resetUsageWorkspaceId,
+    resettingUsageLimit,
+  ]);
   const activeTokenUsage = activeThreadId
     ? tokenUsageByThread[activeThreadId] ?? null
     : null;
@@ -1697,6 +1702,8 @@ export default function MainApp() {
     approvals,
     activeRateLimits,
     activeAccount,
+    accountWorkspaceId,
+    homeAccountWorkspaceId,
     homeRateLimits,
     homeAccount,
     accountSwitching,

src/features/app/components/Sidebar.test.tsx

@@ -32,6 +32,8 @@ const baseProps = {
   activeWorkspaceId: null,
   activeThreadId: null,
   accountRateLimits: null,
+  accountWorkspaceId: null,
+  resetUsageWorkspaceId: null,
   usageShowRemaining: false,
   accountInfo: null,
   savedProfiles: [],
@@ -166,6 +168,8 @@ describe("Sidebar", () => {
       <Sidebar
         {...baseProps}
         activeWorkspaceId="ws-1"
+        accountWorkspaceId="ws-1"
+        resetUsageWorkspaceId="ws-1"
         onResetUsageLimit={onResetUsageLimit}
         accountRateLimits={{
           primary: {
@@ -192,11 +196,45 @@ describe("Sidebar", () => {
     expect(onResetUsageLimit).toHaveBeenCalledTimes(1);
   });
 
+  it("enables reset credits for the Home account workspace before a chat is active", () => {
+    const onResetUsageLimit = vi.fn();
+    render(
+      <Sidebar
+        {...baseProps}
+        activeWorkspaceId={null}
+        accountWorkspaceId="ws-1"
+        resetUsageWorkspaceId="ws-1"
+        onResetUsageLimit={onResetUsageLimit}
+        accountRateLimits={{
+          primary: {
+            usedPercent: 100,
+            windowDurationMins: 300,
+            resetsAt: Math.round(Date.now() / 1000) + 3600,
+          },
+          secondary: null,
+          credits: null,
+          rateLimitResetCredits: {
+            availableCount: 2,
+          },
+          planType: "pro",
+        }}
+      />,
+    );
+
+    const resetButton = screen.getByRole("button", { name: "Reset usage limit" });
+    expect((resetButton as HTMLButtonElement).disabled).toBe(false);
+
+    fireEvent.click(resetButton);
+
+    expect(onResetUsageLimit).toHaveBeenCalledTimes(1);
+  });
+
   it("opens the account menu from the bottom rail", () => {
     render(
       <Sidebar
         {...baseProps}
         activeWorkspaceId="ws-1"
+        accountWorkspaceId="ws-1"
         accountInfo={{
           email: "dimillian@example.com",
           type: "chatgpt",
@@ -212,6 +250,27 @@ describe("Sidebar", () => {
     expect(screen.getByRole("button", { name: "Switch account" })).toBeTruthy();
   });
 
+  it("shows the account menu for the Home account workspace before a chat is active", () => {
+    render(
+      <Sidebar
+        {...baseProps}
+        activeWorkspaceId={null}
+        accountWorkspaceId="ws-1"
+        accountInfo={{
+          email: "home@example.com",
+          type: "chatgpt",
+          planType: "plus",
+          requiresOpenaiAuth: false,
+        }}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole("button", { name: "Account" }));
+
+    expect(screen.getByText("home@example.com")).toBeTruthy();
+    expect(screen.getByRole("button", { name: "Switch account" })).toBeTruthy();
+  });
+
   it("renders threads-only mode as a global chronological list", () => {
     const older = Date.now() - 10_000;
     const newer = Date.now();

src/features/app/components/Sidebar.tsx

@@ -120,6 +120,8 @@ type SidebarProps = {
   activeThreadId: string | null;
   userInputRequests?: RequestUserInputRequest[];
   accountRateLimits: RateLimitSnapshot | null;
+  accountWorkspaceId: string | null;
+  resetUsageWorkspaceId: string | null;
   usageShowRemaining: boolean;
   accountInfo: AccountSnapshot | null;
   savedProfiles: SavedAccountProfile[];
@@ -187,6 +189,8 @@ export const Sidebar = memo(function Sidebar({
   activeThreadId,
   userInputRequests = [],
   accountRateLimits,
+  accountWorkspaceId,
+  resetUsageWorkspaceId,
   usageShowRemaining,
   accountInfo,
   savedProfiles,
@@ -375,9 +379,9 @@ export const Sidebar = memo(function Sidebar({
       ? "API key"
       : "Sign in to Codex";
   const accountActionLabel = accountEmail ? "Switch account" : "Sign in";
-  const showAccountSwitcher = Boolean(activeWorkspaceId);
-  const accountSwitchDisabled = accountSwitching || !activeWorkspaceId;
-  const accountCancelDisabled = !accountSwitching || !activeWorkspaceId;
+  const showAccountSwitcher = Boolean(accountWorkspaceId);
+  const accountSwitchDisabled = accountSwitching || !accountWorkspaceId;
+  const accountCancelDisabled = !accountSwitching || !accountWorkspaceId;
   const refreshDisabled = workspaces.length === 0 || workspaces.every((workspace) => !workspace.connected);
   const refreshInProgress = workspaces.some(
     (workspace) => threadListLoadingByWorkspace[workspace.id] ?? false,
@@ -1052,7 +1056,7 @@ export const Sidebar = memo(function Sidebar({
         onResetUsageLimit={onResetUsageLimit}
         resetUsageDisabled={
           resettingUsageLimit ||
-          !activeWorkspaceId ||
+          !resetUsageWorkspaceId ||
           !accountRateLimits?.rateLimitResetCredits?.availableCount
         }
         resettingUsageLimit={resettingUsageLimit}