fix(ui): keep warning toggle visible

src/client/src/components/ChatView.test.ts

@@ -141,22 +141,6 @@ describe("ChatView session-warning dismiss wiring", () => {
     expect(onDismissWarning).toHaveBeenCalledExactlyOnceWith("anthropicExtraUsage");
   });
 
-  // Escape hatch: this verifies the collapse button's Lit callback wiring in
-  // the node test environment, anchored to its stable semantic class marker.
-  it("invokes onCollapseWarnings from the visible warning area", () => {
-    const view = withStatus(new ChatView(), warningStatus([
-      { severity: "warning", message: "subscription auth is active" },
-    ]));
-    const onCollapseWarnings = vi.fn();
-    view.onCollapseWarnings = onCollapseWarnings;
-
-    const rendered = renderWarnings(view);
-    if (rendered === null) throw new Error("expected a warnings banner");
-    templateEventHandlerAfterMarker(rendered, "session-warnings-collapse")(new Event("click"));
-
-    expect(onCollapseWarnings).toHaveBeenCalledOnce();
-  });
-
   it("removes the warning area while presentation is collapsed or there are no warnings", () => {
     const view = withStatus(new ChatView(), warningStatus([
       { severity: "warning", message: "subscription auth is active" },

src/client/src/components/ChatView.ts

@@ -1,4 +1,4 @@
-import { LitElement, html, svg } from "lit";
+import { LitElement, html } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
 import { repeat } from "lit/directives/repeat.js";
 import { ChatDisclosureController } from "../chatDisclosure";
@@ -199,7 +199,6 @@ export class ChatView extends LitElement {
   @property({ attribute: false }) onDismissNotification?: (notificationId: string) => void;
   @property({ attribute: false }) onDismissAllNotifications?: () => void;
   @property({ type: Boolean }) warningsVisible = true;
-  @property({ attribute: false }) onCollapseWarnings?: () => void;
   @property({ attribute: false }) onLoadMore?: () => void;
   @query(".chat") private chat?: HTMLDivElement;
   @query("dialog.image-zoom") private imageZoomDialog?: HTMLDialogElement;
@@ -253,9 +252,6 @@ export class ChatView extends LitElement {
   private readonly handleClearServerQueue = (): void => {
     this.onClearServerQueue?.();
   };
-  private readonly handleCollapseWarnings = (): void => {
-    this.onCollapseWarnings?.();
-  };
 
   override connectedCallback(): void {
     super.connectedCallback();
@@ -515,24 +511,6 @@ export class ChatView extends LitElement {
     if (!this.warningsVisible || rows.length === 0) return null;
     return html`
       <aside class="session-warnings" role="alert" aria-live="polite">
-        ${this.onCollapseWarnings === undefined ? null : html`
-          <div class="session-warnings-controls">
-            <button
-              type="button"
-              class="session-warnings-collapse"
-              title="Minimise warnings"
-              aria-label="Minimise warnings"
-              @click=${this.handleCollapseWarnings}
-            >
-              ${svg`
-                <svg class="session-warnings-collapse-icon" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                  <path d="m18 15-6-6-6 6"></path>
-                </svg>
-              `}
-              <span>Minimise</span>
-            </button>
-          </div>
-        `}
         ${rows.map((row) => {
           const dismissId = row.dismissId;
           return html`

src/client/src/components/PiWebApp.ts

@@ -27,7 +27,7 @@ import { sessionCleanupRequestKey, sessionCleanupUnavailableMessage } from "../s
 import { selectedNotificationView } from "../sessionNotifications";
 import { hasAuthoritativeSessionPersistence as runtimeHasAuthoritativeSessionPersistence } from "../sessionPersistence";
 import { SessionUnreadController } from "../sessionUnread";
-import { collapseSessionWarnings, initialSessionWarningVisibilityState, reconcileSessionWarningVisibility, restoreSessionWarnings } from "../sessionWarningVisibility";
+import { initialSessionWarningVisibilityState, reconcileSessionWarningVisibility, toggleSessionWarnings } from "../sessionWarningVisibility";
 import { RealtimeSocket, type BrowserRealtimeEvent } from "../sessionSocket";
 import type { PiWebPluginRegistration, PluginMachine, PluginPromptEditor, QualifiedContributionId, QualifiedThemeContribution, QualifiedThemePairContribution, QualifiedWorkspacePanelContribution, PluginRuntimeContext, TerminalCommandRunsInternalRuntime, WorkspaceFiles, WorkspaceHost, WorkspaceLabelContext, WorkspaceLabelItem, WorkspacePanelContext } from "../plugins/types";
 import { CLASSIC_THEME_ID, DEFAULT_THEME_PREFERENCE, applyPiWebTheme, findThemePairForTheme, readStoredThemePreference, resolveThemePreference, writeStoredThemePreference, type ThemePreference, type ThemePreferenceResolution } from "../theme";
@@ -2108,15 +2108,8 @@ export class PiWebApp extends LitElement {
     void this.notifications.dismissAll();
   };
 
-  private readonly handleCollapseWarnings = (): void => {
-    const next = collapseSessionWarnings(this.sessionWarningVisibility);
-    if (next === this.sessionWarningVisibility) return;
-    this.sessionWarningVisibility = next;
-    this.requestUpdate();
-  };
-
-  private readonly handleRestoreWarnings = (): void => {
-    const next = restoreSessionWarnings(this.sessionWarningVisibility);
+  private readonly handleToggleWarnings = (): void => {
+    const next = toggleSessionWarnings(this.sessionWarningVisibility);
     if (next === this.sessionWarningVisibility) return;
     this.sessionWarningVisibility = next;
     this.requestUpdate();
@@ -2132,16 +2125,14 @@ export class PiWebApp extends LitElement {
 
   private renderChatView(state: AppState, session: SessionInfo) {
     return html`
-      <chat-view .sessionId=${session.id} .messages=${state.messages} .messageStart=${state.messagePageStart} .messageEnd=${state.messagePageEnd} .messageTotal=${state.messagePageTotal} .hasMore=${state.messagePageStart > 0} .loadingMore=${state.isLoadingEarlierMessages} .isSendingPrompt=${state.sendingPrompts[session.id] === true} .isCompacting=${state.status?.isCompacting === true} .pendingMessageCount=${state.status?.pendingMessageCount ?? 0} .clientQueuedMessages=${state.clientQueuedSessionMessages[session.id] ?? []} .status=${state.status} .activity=${state.activity} .notificationInbox=${selectedNotificationView(state.selectedNotificationInbox)} .canClearServerQueue=${this.canClearServerQueue()} .onClearServerQueue=${this.handleClearServerQueue} .onDismissWarning=${this.handleDismissWarning} .onDismissNotification=${this.handleDismissNotification} .onDismissAllNotifications=${this.handleDismissAllNotifications} .warningsVisible=${!this.sessionWarningVisibility.collapsed} .onCollapseWarnings=${this.handleCollapseWarnings} .onLoadMore=${() => this.withChatPrependTransition(() => this.sessions.loadEarlierMessages())}></chat-view>
+      <chat-view .sessionId=${session.id} .messages=${state.messages} .messageStart=${state.messagePageStart} .messageEnd=${state.messagePageEnd} .messageTotal=${state.messagePageTotal} .hasMore=${state.messagePageStart > 0} .loadingMore=${state.isLoadingEarlierMessages} .isSendingPrompt=${state.sendingPrompts[session.id] === true} .isCompacting=${state.status?.isCompacting === true} .pendingMessageCount=${state.status?.pendingMessageCount ?? 0} .clientQueuedMessages=${state.clientQueuedSessionMessages[session.id] ?? []} .status=${state.status} .activity=${state.activity} .notificationInbox=${selectedNotificationView(state.selectedNotificationInbox)} .canClearServerQueue=${this.canClearServerQueue()} .onClearServerQueue=${this.handleClearServerQueue} .onDismissWarning=${this.handleDismissWarning} .onDismissNotification=${this.handleDismissNotification} .onDismissAllNotifications=${this.handleDismissAllNotifications} .warningsVisible=${!this.sessionWarningVisibility.collapsed} .onLoadMore=${() => this.withChatPrependTransition(() => this.sessions.loadEarlierMessages())}></chat-view>
     `;
   }
 
   private renderStatusBar(state: AppState) {
-    const collapsedWarningCount = this.sessionWarningVisibility.collapsed
-      ? this.sessionWarningVisibility.warningCount
-      : 0;
+    const warningCount = this.sessionWarningVisibility.warningCount;
     return html`
-      <status-bar .status=${state.status} .collapsedWarningCount=${collapsedWarningCount} .onRestoreWarnings=${this.handleRestoreWarnings}></status-bar>
+      <status-bar .status=${state.status} .warningCount=${warningCount} .warningsExpanded=${warningCount > 0 && !this.sessionWarningVisibility.collapsed} .onToggleWarnings=${this.handleToggleWarnings}></status-bar>
     `;
   }
 

src/client/src/components/PiWebApp.warningVisibility.test.ts

@@ -13,21 +13,24 @@ afterEach(() => {
 });
 
 describe("PiWebApp session-warning visibility wiring", () => {
-  it("collapses the existing warning area and restores it from the status bar", () => {
+  it("keeps the warning control present and toggles the warning area from the status bar", () => {
     const app = createApp();
     const state = stateWithWarnings();
     setAppState(app, state);
     syncWarningVisibility(app);
 
-    const visibleChat = renderChatView(app, state);
-    expect(templateValueAfterMarker(visibleChat, ".warningsVisible=")).toBe(true);
+    const visibleStatusBar = renderStatusBar(app, state);
+    expect(templateValueAfterMarker(renderChatView(app, state), ".warningsVisible=")).toBe(true);
+    expect(templateValueAfterMarker(visibleStatusBar, ".warningCount=")).toBe(2);
+    expect(templateValueAfterMarker(visibleStatusBar, ".warningsExpanded=")).toBe(true);
 
-    const collapse = templateCallbackAfterMarker(visibleChat, ".onCollapseWarnings=");
-    collapse();
+    const toggle = templateCallbackAfterMarker(visibleStatusBar, ".onToggleWarnings=");
+    toggle();
 
-    const collapsedChat = renderChatView(app, state);
-    expect(templateValueAfterMarker(collapsedChat, ".warningsVisible=")).toBe(false);
-    expect(templateValueAfterMarker(renderStatusBar(app, state), ".collapsedWarningCount=")).toBe(2);
+    const collapsedStatusBar = renderStatusBar(app, state);
+    expect(templateValueAfterMarker(renderChatView(app, state), ".warningsVisible=")).toBe(false);
+    expect(templateValueAfterMarker(collapsedStatusBar, ".warningCount=")).toBe(2);
+    expect(templateValueAfterMarker(collapsedStatusBar, ".warningsExpanded=")).toBe(false);
 
     const otherState = stateWithWarnings("session-2");
     setAppState(app, otherState);
@@ -38,18 +41,21 @@ describe("PiWebApp session-warning visibility wiring", () => {
     setAppState(app, returningState);
     syncWarningVisibility(app);
     expect(templateValueAfterMarker(renderChatView(app, returningState), ".warningsVisible=")).toBe(true);
+    expect(templateValueAfterMarker(renderStatusBar(app, returningState), ".warningCount=")).toBe(0);
 
     setAppState(app, state);
     syncWarningVisibility(app);
     const returnedStatusBar = renderStatusBar(app, state);
     expect(templateValueAfterMarker(renderChatView(app, state), ".warningsVisible=")).toBe(false);
-    expect(templateValueAfterMarker(returnedStatusBar, ".collapsedWarningCount=")).toBe(2);
+    expect(templateValueAfterMarker(returnedStatusBar, ".warningCount=")).toBe(2);
+    expect(templateValueAfterMarker(returnedStatusBar, ".warningsExpanded=")).toBe(false);
 
-    const restore = templateCallbackAfterMarker(returnedStatusBar, ".onRestoreWarnings=");
-    restore();
+    templateCallbackAfterMarker(returnedStatusBar, ".onToggleWarnings=")();
 
+    const restoredStatusBar = renderStatusBar(app, state);
     expect(templateValueAfterMarker(renderChatView(app, state), ".warningsVisible=")).toBe(true);
-    expect(templateValueAfterMarker(renderStatusBar(app, state), ".collapsedWarningCount=")).toBe(0);
+    expect(templateValueAfterMarker(restoredStatusBar, ".warningCount=")).toBe(2);
+    expect(templateValueAfterMarker(restoredStatusBar, ".warningsExpanded=")).toBe(true);
   });
 });
 

src/client/src/components/StatusBar.test.ts

@@ -5,35 +5,36 @@ import { templateEventHandlerAfterMarker } from "../templateInspection.testSuppo
 import { StatusBar, statusBarWarningControlContent } from "./StatusBar";
 
 describe("statusBarWarningControlContent", () => {
-  it("provides only the visible numeric count while keeping a descriptive accessible label", () => {
-    expect(statusBarWarningControlContent(1)).toEqual({
+  it("provides an action label for both states while keeping only the count visible", () => {
+    expect(statusBarWarningControlContent(1, true)).toEqual({
       countText: "1",
-      accessibleLabel: "Show 1 warning in the warning area",
+      accessibleLabel: "Minimise 1 warning",
     });
-    expect(statusBarWarningControlContent(3)).toEqual({
+    expect(statusBarWarningControlContent(3, false)).toEqual({
       countText: "3",
       accessibleLabel: "Show 3 warnings in the warning area",
     });
   });
 
-  it("omits the control content when there are no collapsed warnings", () => {
-    expect(statusBarWarningControlContent(0)).toBeUndefined();
+  it("omits the control content when there are no warnings", () => {
+    expect(statusBarWarningControlContent(0, false)).toBeUndefined();
   });
 });
 
-describe("StatusBar warning restore wiring", () => {
+describe("StatusBar warning toggle wiring", () => {
   // Escape hatch: this specifically verifies the compact status-bar button's
   // Lit callback wiring in the node environment, anchored to its semantic class.
-  it("invokes onRestoreWarnings when the warning-count control is activated", () => {
+  it("invokes onToggleWarnings when the warning-count control is activated", () => {
     const statusBar = new StatusBar();
-    const onRestoreWarnings = vi.fn();
+    const onToggleWarnings = vi.fn();
     statusBar.status = status();
-    statusBar.collapsedWarningCount = 2;
-    statusBar.onRestoreWarnings = onRestoreWarnings;
+    statusBar.warningCount = 2;
+    statusBar.warningsExpanded = true;
+    statusBar.onToggleWarnings = onToggleWarnings;
 
-    templateEventHandlerAfterMarker(renderStatusBar(statusBar), "warning-restore")(new Event("click"));
+    templateEventHandlerAfterMarker(renderStatusBar(statusBar), "warning-toggle")(new Event("click"));
 
-    expect(onRestoreWarnings).toHaveBeenCalledOnce();
+    expect(onToggleWarnings).toHaveBeenCalledOnce();
   });
 });
 

src/client/src/components/StatusBar.ts

@@ -9,23 +9,24 @@ export interface StatusBarWarningControlContent {
   accessibleLabel: string;
 }
 
-export function statusBarWarningControlContent(count: number): StatusBarWarningControlContent | undefined {
+export function statusBarWarningControlContent(count: number, expanded: boolean): StatusBarWarningControlContent | undefined {
   if (!Number.isInteger(count) || count <= 0) return undefined;
   const warningText = `${String(count)} ${count === 1 ? "warning" : "warnings"}`;
   return {
     countText: String(count),
-    accessibleLabel: `Show ${warningText} in the warning area`,
+    accessibleLabel: expanded ? `Minimise ${warningText}` : `Show ${warningText} in the warning area`,
   };
 }
 
 @customElement("status-bar")
 export class StatusBar extends LitElement {
   @property({ attribute: false }) status?: SessionStatus;
-  @property({ type: Number }) collapsedWarningCount = 0;
-  @property({ attribute: false }) onRestoreWarnings?: () => void;
+  @property({ type: Number }) warningCount = 0;
+  @property({ type: Boolean }) warningsExpanded = false;
+  @property({ attribute: false }) onToggleWarnings?: () => void;
 
-  private readonly handleRestoreWarnings = (): void => {
-    this.onRestoreWarnings?.();
+  private readonly handleToggleWarnings = (): void => {
+    this.onToggleWarnings?.();
   };
 
   override render() {
@@ -38,18 +39,19 @@ export class StatusBar extends LitElement {
         : `${context.percent.toFixed(1)}%/${formatTokenCount(context.contextWindow)}`
       : "context unknown";
     const tokens = status.tokens;
-    const warningControl = statusBarWarningControlContent(this.collapsedWarningCount);
+    const warningControl = statusBarWarningControlContent(this.warningCount, this.warningsExpanded);
     return html`
       <div class="bar">
-        ${warningControl === undefined || this.onRestoreWarnings === undefined ? null : html`
+        ${warningControl === undefined || this.onToggleWarnings === undefined ? null : html`
           <button
             type="button"
-            class="warning-restore"
+            class="warning-toggle"
             title=${warningControl.accessibleLabel}
             aria-label=${warningControl.accessibleLabel}
-            @click=${this.handleRestoreWarnings}
+            aria-expanded=${String(this.warningsExpanded)}
+            @click=${this.handleToggleWarnings}
           >
-            ${renderSessionWarningIcon("warning", "warning-restore-icon")}
+            ${renderSessionWarningIcon("warning", "warning-toggle-icon")}
             <span>${warningControl.countText}</span>
           </button>
         `}

src/client/src/components/shared.ts

@@ -307,11 +307,6 @@ export const chatStyles = css`
   .top-notices { box-sizing: border-box; flex: 0 0 auto; max-height: 40%; min-height: 0; display: flex; flex-direction: column; overflow: hidden; border-bottom: 1px solid var(--pi-border); background: var(--pi-bg-overlay); }
   .session-warnings { flex: 0 1 auto; display: grid; gap: 8px; max-height: 50%; min-height: 0; overflow-y: auto; box-sizing: border-box; padding: 10px 16px; border-bottom: 1px solid var(--pi-border-muted); }
   .session-warnings:only-child { flex: 1 1 auto; max-height: 100%; border-bottom: 0; }
-  .session-warnings-controls { display: flex; justify-content: flex-end; }
-  .session-warnings-collapse { display: inline-flex; align-items: center; gap: 5px; border: 1px solid var(--pi-border); border-radius: 6px; background: var(--pi-surface); color: var(--pi-muted); padding: 4px 7px; font: 12px system-ui, sans-serif; cursor: pointer; }
-  .session-warnings-collapse:hover, .session-warnings-collapse:focus-visible { color: var(--pi-text-bright); border-color: var(--pi-accent); background: var(--pi-bg-overlay); }
-  .session-warnings-collapse:focus-visible { outline: 1px solid var(--pi-border); outline-offset: 2px; }
-  .session-warnings-collapse-icon { width: 14px; height: 14px; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; pointer-events: none; }
   .session-warning { position: relative; display: grid; gap: 4px; box-sizing: border-box; padding: 10px 34px 10px 12px; border: 1px solid var(--pi-warning-border); border-radius: 10px; background: var(--pi-warning-surface); color: var(--pi-text); }
   .session-warning.error { border-color: var(--pi-danger); background: color-mix(in srgb, var(--pi-danger) 12%, var(--pi-surface)); }
   .session-warning.info { border-color: var(--pi-accent-border); background: var(--pi-selection-bg); }
@@ -493,9 +488,9 @@ export const statusBarStyles = css`
   :host { display: block; color: var(--pi-muted); font: 12px system-ui, sans-serif; }
   .bar { display: flex; justify-content: flex-end; gap: 12px; align-items: center; min-width: 0; padding: 7px 12px; border-top: 1px solid var(--pi-border); background: var(--pi-bg); white-space: nowrap; overflow: hidden; }
   span { flex: 0 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; }
-  .warning-restore { flex: 0 0 auto; display: inline-flex; align-items: center; gap: 4px; margin-right: auto; border: 0; background: transparent; color: inherit; padding: 0; font: inherit; line-height: 1; white-space: nowrap; cursor: pointer; }
-  .warning-restore:focus-visible { outline: 1px solid currentColor; outline-offset: 2px; }
-  .warning-restore-icon { flex: 0 0 auto; width: 12px; height: 12px; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
+  .warning-toggle { flex: 0 0 auto; display: inline-flex; align-items: center; gap: 4px; margin-right: auto; border: 0; background: transparent; color: inherit; padding: 0; font: inherit; line-height: 1; white-space: nowrap; cursor: pointer; }
+  .warning-toggle:focus-visible { outline: 1px solid currentColor; outline-offset: 2px; }
+  .warning-toggle-icon { flex: 0 0 auto; width: 12px; height: 12px; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
   .activity { display: inline-flex; align-items: center; gap: 6px; color: var(--pi-muted); }
   .activity.active { color: var(--pi-success); }
   .dot { width: 7px; height: 7px; border-radius: 50%; background: currentColor; opacity: .45; flex: 0 0 auto; }

src/client/src/sessionWarningVisibility.test.ts

@@ -6,6 +6,7 @@ import {
   reconcileSessionWarningVisibility,
   restoreSessionWarnings,
   sessionWarningSetSignature,
+  toggleSessionWarnings,
 } from "./sessionWarningVisibility";
 
 const subscriptionWarning: SessionWarning = { severity: "warning", message: "subscription auth is active", source: "anthropic", dismiss: { id: "anthropicExtraUsage" } };
@@ -95,4 +96,14 @@ describe("session warning visibility transitions", () => {
     expect(restored.collapsed).toBe(false);
     expect(restored.collapsedWarningSets.size).toBe(0);
   });
+
+  it("uses one toggle transition for both warning-area states", () => {
+    const visible = reconcileSessionWarningVisibility(initialSessionWarningVisibilityState(), "session-1", warnings);
+    const collapsed = toggleSessionWarnings(visible);
+    const restored = toggleSessionWarnings(collapsed);
+
+    expect(collapsed.collapsed).toBe(true);
+    expect(restored.collapsed).toBe(false);
+    expect(restored.collapsedWarningSets.size).toBe(0);
+  });
 });

src/client/src/sessionWarningVisibility.ts

@@ -79,3 +79,7 @@ export function restoreSessionWarnings(current: SessionWarningVisibilityState):
   if (current.selectedSessionKey !== undefined) collapsedWarningSets.delete(current.selectedSessionKey);
   return { ...current, collapsed: false, collapsedWarningSets };
 }
+
+export function toggleSessionWarnings(current: SessionWarningVisibilityState): SessionWarningVisibilityState {
+  return current.collapsed ? restoreSessionWarnings(current) : collapseSessionWarnings(current);
+}