Skip to content

Your lightweight open-source personal agent.

fix(webui): keep context sidebar owned by the pane layout

chengyongrue4e04768d29e
diff --git a/webui/browser/history-hydration.spec.ts b/webui/browser/history-hydration.spec.ts
index 73e98f964..88e962b57 100644
--- a/webui/browser/history-hydration.spec.ts
+++ b/webui/browser/history-hydration.spec.ts
@@ -289,6 +289,52 @@ test("synthetic HTTP-first cumulative text suppresses delayed covered chunks but
backend.healthy();
});
+test("the open context sidebar keeps its slot while a new conversation hydrates", async ({ page }) => {
+ const { backend } = await openFixture(page);
+ const contextHistory = (chatId: string, name: string, tokens: number) => {
+ const turn = `${chatId}-context`;
+ return history([
+ input(turn, `Inspect ${name}`, chatId),
+ { ...at(turn, 1, "activity", chatId), event: "model_request", request_id: `${turn}-request`,
+ run_id: turn, sequence: 1, phase: "completed", context_window_tokens: 10000,
+ usage: { prompt_tokens: tokens, context_tokens: tokens },
+ request_usage: { prompt_tokens: tokens, context_tokens: tokens },
+ context_graph: { nodes: [{ path: `/${name}`, name, state: "loaded", tokens: 100 }], edges: [] } },
+ { ...at(turn, 2, "answer", chatId), event: "message", text: `Inspected ${name}.` },
+ { ...at(turn, 3, "complete", chatId), event: "turn_end" },
+ ], { chatId });
+ };
+ await backend.release(await backend.read(), contextHistory(A, "first.md", 1000));
+ await page.getByTestId("composer-context-usage").click();
+ const sidebar = page.getByTestId("context-sidebar");
+ await expect(sidebar.getByRole("button", { name: "first.md", exact: true })).toBeVisible();
+ await expect(sidebar.getByRole("progressbar")).toHaveAttribute("aria-valuenow", "10");
+ await sidebar.evaluate((node) => node.setAttribute("data-session-slot", "retained"));
+ const expectSlot = async () => {
+ await expect(sidebar).toHaveAttribute("data-session-slot", "retained");
+ await expect.poll(() => sidebar.evaluate((node) => node.getBoundingClientRect().width)).toBe(420);
+ await expect.poll(() => sidebar.locator(".file-preview-content").evaluate((node) => {
+ const surface = document.querySelector(".thread-composer-surface")!;
+ return Math.abs(node.getBoundingClientRect().bottom - surface.getBoundingClientRect().bottom);
+ })).toBeLessThan(1);
+ expect((await sidebar.locator(".file-preview-content").boundingBox())!.height).toBeGreaterThan(300);
+ };
+ await expectSlot();
+
+ await page.getByRole("button", { name: "Conversation B", exact: true }).click();
+ const target = await backend.read(B);
+ // The pane stays open with unknown usage, never the outgoing session's graph.
+ await expect(sidebar.getByRole("button", { name: "first.md", exact: true })).toHaveCount(0);
+ await expect(sidebar.getByRole("progressbar")).not.toHaveAttribute("aria-valuenow");
+ await expectSlot();
+
+ await backend.release(target, contextHistory(B, "second.md", 2000));
+ await expect(sidebar.getByRole("button", { name: "second.md", exact: true })).toBeVisible();
+ await expect(sidebar.getByRole("progressbar")).toHaveAttribute("aria-valuenow", "20");
+ await expectSlot();
+ backend.healthy();
+});
+
test("switching away from file edits does not rebuild the outgoing diff before history hands over", async ({ page }) => {
await page.addInitScript(() => {
localStorage.setItem("nanobot-webui.settings-preferences", JSON.stringify({
diff --git a/webui/browser/mobile-chat-layout-fixture.tsx b/webui/browser/mobile-chat-layout-fixture.tsx
index 7d7c000dc..22d1e79e5 100644
--- a/webui/browser/mobile-chat-layout-fixture.tsx
+++ b/webui/browser/mobile-chat-layout-fixture.tsx
@@ -1,6 +1,7 @@
import { useEffect, useState } from "react";
import { CalendarClock, ListFilter } from "lucide-react";
import { ThreadComposer } from "@/components/thread/ThreadComposer";
+import { ComposerUsagePopover } from "@/components/thread/ComposerUsagePopover";
import { ThreadHeader } from "@/components/thread/ThreadHeader";
import { ThreadViewport } from "@/components/thread/ThreadViewport";
import { Button } from "@/components/ui/button";
@@ -34,19 +35,21 @@ export function MobileChatLayoutFixture({ parameters }: { parameters: URLSearchP
sessionInfoAction={<Button variant="ghost" size="icon" aria-label="Session details"><CalendarClock className="h-3.5 w-3.5" /></Button>}
promptNavigatorAction={<Button variant="ghost" size="icon" aria-label="Conversation navigation"><ListFilter className="h-3.5 w-3.5" /></Button>}
/>
- <ThreadViewport messages={messages} isStreaming={false} conversationReady conversationKey="websocket:mobile-layout-preview"
- hasMoreBefore={false} showScrollToBottomButton
- composer={<ThreadComposer variant="thread" onSend={() => {}}
- modelLabel="6.1-max" modelProvider="openai-codex" onTranscribeAudio={async () => ""}
- contextUsage={parameters.has("no-context") ? null : { contextTokens: 44_000, contextWindowTokens: 200_000 }}
- workspaceScope={scope} workspaceDefaultScope={initialScope} workspaceControls={catalog.controls}
- workspaceProjectLocked={!parameters.has("project")}
- onWorkspaceScopeChange={setScope} onLoadWorkspaceProjects={async () => catalog}
- onResolveWorkspaceProject={async path => ({ path, name: "nanobot" })}
- onFavoriteWorkspaceProject={async () => []}
- onBrowseWorkspaceDirectories={async path => ({ path, parent: null, entries: [], truncated: false, host: "preview", platform: "Linux" })}
+ <ComposerUsagePopover context={parameters.has("no-context") ? null : { contextTokens: 44_000, contextWindowTokens: 200_000 }} rounds={[]}>
+ {(renderContextUsage) => <ThreadViewport messages={messages} isStreaming={false} conversationReady conversationKey="websocket:mobile-layout-preview"
+ hasMoreBefore={false} showScrollToBottomButton
+ composer={<ThreadComposer variant="thread" onSend={() => {}}
+ modelLabel="6.1-max" modelProvider="openai-codex" onTranscribeAudio={async () => ""}
+ renderContextUsage={renderContextUsage}
+ workspaceScope={scope} workspaceDefaultScope={initialScope} workspaceControls={catalog.controls}
+ workspaceProjectLocked={!parameters.has("project")}
+ onWorkspaceScopeChange={setScope} onLoadWorkspaceProjects={async () => catalog}
+ onResolveWorkspaceProject={async path => ({ path, name: "nanobot" })}
+ onFavoriteWorkspaceProject={async () => []}
+ onBrowseWorkspaceDirectories={async path => ({ path, parent: null, entries: [], truncated: false, host: "preview", platform: "Linux" })}
+ />}
/>}
- />
+ </ComposerUsagePopover>
</main>
);
}
diff --git a/webui/browser/workspace-alignment-fixture.tsx b/webui/browser/workspace-alignment-fixture.tsx
index c0bd326a5..4dd650d43 100644
--- a/webui/browser/workspace-alignment-fixture.tsx
+++ b/webui/browser/workspace-alignment-fixture.tsx
@@ -1,5 +1,6 @@
import { useState } from "react";
import { ThreadComposer } from "@/components/thread/ThreadComposer";
+import { ComposerUsagePopover } from "@/components/thread/ComposerUsagePopover";
import type { WorkspaceScopePayload, WorkspacesPayload } from "@/lib/types";
const initialScope: WorkspaceScopePayload = { project_path: "/workspace", access_mode: "full" };
@@ -11,13 +12,15 @@ const catalog: WorkspacesPayload = {
export function WorkspaceAlignmentFixture({ parameters }: { parameters: URLSearchParams }) {
const [scope, setScope] = useState(initialScope);
return <main className="mx-auto w-full max-w-5xl px-4 pt-24" style={{ maxWidth: parameters.has("containerWidth") ? Number(parameters.get("containerWidth")) : undefined }}>
- <ThreadComposer variant={parameters.get("composerVariant") === "thread" ? "thread" : "hero"}
- onSend={() => {}} workspaceScope={scope} workspaceDefaultScope={initialScope}
- contextUsage={parameters.has("usage") ? { contextTokens: 500, contextWindowTokens: 1000 } : null}
- workspaceControls={catalog.controls} onWorkspaceScopeChange={setScope}
- onLoadWorkspaceProjects={async () => catalog}
- onResolveWorkspaceProject={async path => ({ path, name: "workspace" })}
- onFavoriteWorkspaceProject={async () => []}
- onBrowseWorkspaceDirectories={async path => ({ path, parent: null, entries: [], truncated: false, host: "fixture", platform: "Linux" })} />
+ <ComposerUsagePopover context={parameters.has("usage") ? { contextTokens: 500, contextWindowTokens: 1000 } : null} rounds={[]}>
+ {(renderContextUsage) => <ThreadComposer variant={parameters.get("composerVariant") === "thread" ? "thread" : "hero"}
+ onSend={() => {}} workspaceScope={scope} workspaceDefaultScope={initialScope}
+ renderContextUsage={renderContextUsage}
+ workspaceControls={catalog.controls} onWorkspaceScopeChange={setScope}
+ onLoadWorkspaceProjects={async () => catalog}
+ onResolveWorkspaceProject={async path => ({ path, name: "workspace" })}
+ onFavoriteWorkspaceProject={async () => []}
+ onBrowseWorkspaceDirectories={async path => ({ path, parent: null, entries: [], truncated: false, host: "fixture", platform: "Linux" })} />}
+ </ComposerUsagePopover>
</main>;
}
diff --git a/webui/src/App.tsx b/webui/src/App.tsx
index e8d4c1018..610cefaf6 100644
--- a/webui/src/App.tsx
+++ b/webui/src/App.tsx
@@ -3118,6 +3118,7 @@ function Shell({
composerPortalTarget={context.composerPortalTarget}
navigationFrame={context.navigationFrame}
composerActive={context.active}
+ multiplePanes={context.multiplePanes}
composerInputAriaLabel={t("workbench.composerAria", {
title: pane.title,
})}
diff --git a/webui/src/components/thread/ComposerUsagePopover.tsx b/webui/src/components/thread/ComposerUsagePopover.tsx
index 775e0c446..686d0c5c0 100644
--- a/webui/src/components/thread/ComposerUsagePopover.tsx
+++ b/webui/src/components/thread/ComposerUsagePopover.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useId, useRef, useState, type KeyboardEvent } from "react";
+import { useEffect, useId, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
import { createPortal } from "react-dom";
import { useTranslation } from "react-i18next";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
@@ -20,6 +20,8 @@ export interface ComposerRoundUsage {
generationMs?: number;
}
+export type ComposerUsageControl = (layout: { showLabel: boolean; compactLabel: boolean }) => ReactNode;
+
export function ComposerUsagePopover({
context,
rounds,
@@ -28,7 +30,8 @@ export function ComposerUsagePopover({
showLabel = false,
compactLabel = false,
sidebarHost,
- triggerHost,
+ sessionKey,
+ children,
open: controlledOpen,
onOpenChange,
}: {
@@ -39,7 +42,8 @@ export function ComposerUsagePopover({
showLabel?: boolean;
compactLabel?: boolean;
sidebarHost?: HTMLElement | null;
- triggerHost?: HTMLElement | null;
+ sessionKey?: string | null;
+ children?: (renderControl: ComposerUsageControl | undefined) => ReactNode;
open?: boolean;
onOpenChange?: (open: boolean) => void;
}) {
@@ -66,9 +70,7 @@ export function ComposerUsagePopover({
&& context.contextTokens >= 0
&& Number.isFinite(context.contextWindowTokens)
&& (context.contextWindowTokens ?? 0) > 0;
- if (!open && !hasContext && !hasRounds && !snapshots.length) {
- return null;
- }
+ const available = open || hasContext || hasRounds || snapshots.length > 0;
const contextPercentage = hasContext
? Math.min(
@@ -96,8 +98,9 @@ export function ComposerUsagePopover({
: `${contextDescription}. ${detailsLabel}`;
const ringCircumference = 2 * Math.PI * 6;
const ringLength = ringCircumference * meterPercentage / 100;
- const showTextLabel = showLabel && (!compactLabel || contextPercentage !== null);
- const trigger = (
+ const renderControl: ComposerUsageControl = ({ showLabel, compactLabel }) => {
+ const showTextLabel = showLabel && (!compactLabel || contextPercentage !== null);
+ const trigger = (
<button
type="button"
ref={triggerRef}
@@ -162,24 +165,25 @@ export function ComposerUsagePopover({
</span>
) : null}
</button>
- );
+ );
- const triggerWithTooltip = <TooltipProvider>
- <Tooltip>
- <TooltipTrigger asChild>{trigger}</TooltipTrigger>
- <TooltipContent side="top" className="text-xs">{contextDescription}</TooltipContent>
- </Tooltip>
- </TooltipProvider>;
+ return <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>{trigger}</TooltipTrigger>
+ <TooltipContent side="top" className="text-xs">{contextDescription}</TooltipContent>
+ </Tooltip>
+ </TooltipProvider>;
+ };
- const inspector = <ContextInspector sidebar expandable={!narrow} context={context} rounds={rounds} snapshots={snapshots}
+ const inspector = <ContextInspector key={sessionKey} sidebar expandable={!narrow} context={context} rounds={rounds} snapshots={snapshots}
onOpenFile={onOpenFile ? (path) => { setOpen(false); onOpenFile(path); } : undefined} />;
const onPanelKeyDown = (event: KeyboardEvent<HTMLElement>) => {
if (event.key === "Escape" && !event.defaultPrevented) { event.preventDefault(); close(); }
};
return <>
- {triggerHost === undefined ? triggerWithTooltip : triggerHost && createPortal(triggerWithTooltip, triggerHost)}
- {narrow ? <Dialog open={open} onOpenChange={setOpen} modal={!sidebarHost}>
+ {children ? children(available ? renderControl : undefined) : available && renderControl({ showLabel, compactLabel })}
+ {available && (narrow ? <Dialog open={open} onOpenChange={setOpen} modal={!sidebarHost}>
<DialogContent portalContainer={sidebarHost} placement="bottom" id={panelId} aria-describedby={undefined}
data-testid="context-sidebar"
overlayClassName={cn("context-drawer-backdrop", sidebarHost && "absolute bg-black/25 backdrop-blur-[8px] sm:bg-transparent sm:backdrop-blur-none")}
@@ -195,6 +199,6 @@ export function ComposerUsagePopover({
</Dialog> : createPortal(<SidebarPanel open={open} width={420} floating={!sidebarHost} id={panelId}
aria-label={t("thread.composer.context.panelTitle")} data-testid="context-sidebar" onKeyDown={onPanelKeyDown}>
{inspector}
- </SidebarPanel>, sidebarHost ?? document.body)}
+ </SidebarPanel>, sidebarHost ?? document.body))}
</>;
}
diff --git a/webui/src/components/thread/ThreadComposer.tsx b/webui/src/components/thread/ThreadComposer.tsx
index 85e487397..50c168baf 100644
--- a/webui/src/components/thread/ThreadComposer.tsx
+++ b/webui/src/components/thread/ThreadComposer.tsx
@@ -91,11 +91,7 @@ import {
ModelPresetBadge,
type ModelPresetOption,
} from "@/components/thread/ModelPresetBadge";
-import {
- ComposerUsagePopover,
- type ComposerContextUsage,
- type ComposerRoundUsage,
-} from "@/components/thread/ComposerUsagePopover";
+import type { ComposerUsageControl } from "@/components/thread/ComposerUsagePopover";
import {
ACCEPT_ATTR,
acceptedAttachmentKind,
@@ -239,13 +235,7 @@ interface ThreadComposerProps {
modelNeedsSetup?: boolean;
onModelBadgeClick?: () => void;
onManageModels?: () => void;
- contextUsage?: ComposerContextUsage | null;
- recentRoundUsage?: readonly ComposerRoundUsage[];
- contextSnapshots?: readonly import("@/lib/types").ContextSnapshot[];
- onOpenContextFile?: (path: string) => void;
- contextSidebarHost?: HTMLElement | null;
- contextSidebarOpen?: boolean;
- onContextSidebarOpenChange?: (open: boolean) => void;
+ renderContextUsage?: ComposerUsageControl;
variant?: "thread" | "hero";
slashCommands?: SlashCommand[];
onMentionSearch?: () => void;
@@ -1083,13 +1073,7 @@ export function ThreadComposer({
modelNeedsSetup = false,
onModelBadgeClick,
onManageModels,
- contextUsage = null,
- recentRoundUsage = [],
- contextSnapshots = [],
- onOpenContextFile,
- contextSidebarHost,
- contextSidebarOpen,
- onContextSidebarOpenChange,
+ renderContextUsage,
variant = "thread",
slashCommands = [],
onMentionSearch,
@@ -1181,7 +1165,6 @@ export function ThreadComposer({
const formRef = useRef<HTMLFormElement>(null);
const tabFocusRequested = useRef(false);
const [compactControls, setCompactControls] = useState(false);
- const [usageTriggerHost, setUsageTriggerHost] = useState<HTMLSpanElement | null>(null);
useEffect(() => {
// Automatic session focus should not open the hint; keyboard navigation should.
@@ -2626,9 +2609,8 @@ export function ThreadComposer({
/>
) : null;
const usageInMeta = mobileWorkspaceControls || compactControls;
- const usageControl = !voiceRecorder.isRecording && (contextUsage || recentRoundUsage.length || contextSnapshots.length) ? (
- <ComposerUsagePopover triggerHost={usageTriggerHost} context={contextUsage} rounds={recentRoundUsage} snapshots={contextSnapshots} onOpenFile={onOpenContextFile} showLabel={usageInMeta} compactLabel={mobileWorkspaceControls} sidebarHost={contextSidebarHost} open={contextSidebarOpen} onOpenChange={onContextSidebarOpenChange} />
- ) : null;
+ const usageControl = !voiceRecorder.isRecording
+ ? renderContextUsage?.({ showLabel: usageInMeta, compactLabel: mobileWorkspaceControls }) : null;
const inputTextClasses = cn(
// Keep the overlay's CJK/Latin spacing aligned with the native textarea caret.
"w-full resize-none bg-transparent text-composer [text-autospace:no-autospace]",
@@ -2947,7 +2929,7 @@ export function ThreadComposer({
)}
>
{modelControl}
- {!usageInMeta && usageControl ? <span className="contents" ref={setUsageTriggerHost} /> : null}
+ {!usageInMeta ? usageControl : null}
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
@@ -3024,13 +3006,12 @@ export function ThreadComposer({
</div>
{usageInMeta && usageControl || mobileWorkspaceControls && accessControl ? (
<div className={cn("ml-auto flex shrink-0 items-center gap-1", mobileWorkspaceControls && "h-11 max-w-[calc(100%-3rem)]")}>
- {usageInMeta && usageControl ? <span className="contents" ref={setUsageTriggerHost} /> : null}
+ {usageInMeta ? usageControl : null}
{mobileWorkspaceControls ? accessControl : null}
</div>
) : null}
</div>
) : null}
- {usageControl}
</form>
);
}
diff --git a/webui/src/components/thread/ThreadShell.tsx b/webui/src/components/thread/ThreadShell.tsx
index 1c60ca8fe..487ce9c02 100644
--- a/webui/src/components/thread/ThreadShell.tsx
+++ b/webui/src/components/thread/ThreadShell.tsx
@@ -20,9 +20,11 @@ import { latestSubagentInputKey } from "@/lib/subagent-tasks";
import { SessionInfoPopover } from "@/components/thread/SessionInfoPopover";
import type { ComposerDraft, ComposerDraftStore } from "@/lib/composer-draft";
import { ThreadComposer } from "@/components/thread/ThreadComposer";
-import type {
- ComposerContextUsage,
- ComposerRoundUsage,
+import {
+ ComposerUsagePopover,
+ type ComposerContextUsage,
+ type ComposerRoundUsage,
+ type ComposerUsageControl,
} from "@/components/thread/ComposerUsagePopover";
import {
modelPresetOptionsFromSettings,
@@ -240,6 +242,7 @@ interface ThreadShellProps {
composerPortalTarget?: HTMLElement | null;
navigationFrame?: HTMLElement | null;
composerActive?: boolean;
+ multiplePanes?: boolean;
composerInputAriaLabel?: string;
emptyComposerVariant?: "hero" | "thread";
workspaceScope?: WorkspaceScopePayload | null;
@@ -461,6 +464,7 @@ export function ThreadShell({
composerPortalTarget,
navigationFrame,
composerActive = true,
+ multiplePanes = false,
composerInputAriaLabel,
emptyComposerVariant = "hero",
workspaceScope = null,
@@ -535,14 +539,16 @@ export function ThreadShell({
const { state: previewState, openFile, resolveFile, selectTab, closeTab, close: closePreview, setWidth: setFilePreviewWidth } =
useFilePreviewState(previewSessionKey, filePreviewStore);
const [contextSidebarOpen, setContextSidebarOpen] = useState(false);
- useLayoutEffect(() => { setContextSidebarOpen(false); }, [previewSessionKey]);
+ useLayoutEffect(() => {
+ if (multiplePanes) setContextSidebarOpen(false);
+ }, [multiplePanes, previewSessionKey]);
const [sidebarEnterWidth, setSidebarEnterWidth] = useState(0);
const [contextSidebarHost, setContextSidebarHost] = useState<HTMLElement | null>(null);
const setSidebarHost = useCallback((node: HTMLElement | null) => { shellRef.current = node; setContextSidebarHost(node); }, []);
const [closingPreview, setClosingPreview] = useState<{ key: string; state: FilePreviewState } | null>(null);
const filePreviewClosing = closingPreview?.key === previewSessionKey;
const visiblePreview = filePreviewClosing ? closingPreview.state : previewState;
- const activePreview = visiblePreview.tabs.find((tab) => tab.id === visiblePreview.activeId);
+ const activePreview = contextSidebarOpen ? undefined : visiblePreview.tabs.find((tab) => tab.id === visiblePreview.activeId);
const previewOpen = Boolean(activePreview);
const sidebarOpen = previewOpen || contextSidebarOpen;
const [localComposerHost, setLocalComposerHost] = useState<HTMLDivElement | null>(null);
@@ -554,7 +560,7 @@ export function ThreadShell({
// attached until that destination is ready.
if (!composerDestination) { if (!inlineComposer) composerMount.remove(); return; }
if (composerMount.parentElement === composerDestination) return;
- // Move the host, not the React subtree: drafts, graph replay and exit presence survive.
+ // Move the host, not the React subtree, to preserve the input and its draft.
const focused = document.activeElement instanceof HTMLElement && composerMount.contains(document.activeElement)
? document.activeElement : null;
const selection = document.getSelection();
@@ -579,10 +585,10 @@ export function ThreadShell({
const [composerFocusSignal, setComposerFocusSignal] = useState(0);
const shellRef = useRef<HTMLElement | null>(null);
const [conversationElement, setConversationElement] = useState<HTMLDivElement | null>(null);
- const composerSurfaceRef = useRef<HTMLDivElement | null>(null);
+ const [composerSurface, setComposerSurface] = useState<HTMLDivElement | null>(null);
useLayoutEffect(() => {
const shell = contextSidebarHost;
- const surface = composerSurfaceRef.current;
+ const surface = composerSurface;
if (!sidebarOpen || !inlineComposer || !shell || !surface) return;
// Metadata can wrap below the input card. Align sidebars to the visible
// surface, rather than assuming a fixed composer/footer padding.
@@ -596,7 +602,7 @@ export function ThreadShell({
observer.observe(composerMount);
observer.observe(surface);
return () => observer.disconnect();
- }, [contextSidebarHost, sidebarOpen, inlineComposer, composerDestination, composerMount]);
+ }, [contextSidebarHost, sidebarOpen, inlineComposer, composerDestination, composerMount, composerSurface]);
const filePreviewWidthRef = useRef(FILE_PREVIEW_DEFAULT_WIDTH);
const filePreviewCloseTimerRef = useRef<number | null>(null);
const filePreviewResizeCleanupRef = useRef<(() => void) | null>(null);
@@ -732,7 +738,9 @@ export function ThreadShell({
useEffect(() => {
if (hasAppMentions) requestMentionCatalogs();
}, [hasAppMentions, requestMentionCatalogs]);
- const usageSnapshots = useMemo(() => composerUsageSnapshots(messages, modelRequests), [messages, modelRequests]);
+ const usageSnapshots = useMemo(
+ () => messagesReady ? composerUsageSnapshots(messages, modelRequests) : [], [messages, modelRequests, messagesReady],
+ );
const composerContextUsage = useMemo(
() => latestComposerContextUsage(usageSnapshots),
[usageSnapshots],
@@ -742,7 +750,7 @@ export function ThreadShell({
[usageSnapshots],
);
const contextGraphSnapshots = useMemo(
- () => composerContextSnapshots(messages, modelRequests), [messages, modelRequests],
+ () => messagesReady ? composerContextSnapshots(messages, modelRequests) : [], [messages, modelRequests, messagesReady],
);
const currentGoalState = messagesReady ? goalState : undefined;
// Recovery decisions gate queued input, not the ledger-owned run state.
@@ -1318,7 +1326,7 @@ export function ThreadShell({
[chatId, onForkChat],
);
- const composer = (
+ const composer = (renderContextUsage: ComposerUsageControl | undefined) => (
<div className={composerVariant === "hero" ? "thread-composer-stack is-hero" : "thread-composer-stack"}>
{modelFallback?.chatId === chatId && !modelFallback.dismissed ? (
<ModelFallbackNotice
@@ -1373,15 +1381,9 @@ export function ThreadShell({
modelNeedsSetup={modelBadge.needsSetup}
onModelBadgeClick={modelBadge.needsSetup ? onOpenModelSettings : undefined}
onManageModels={onOpenModelSettings}
- contextUsage={composerContextUsage}
- recentRoundUsage={composerRoundUsage}
- contextSnapshots={contextGraphSnapshots}
- onOpenContextFile={handleOpenFilePreview}
- contextSidebarHost={contextSidebarHost}
- contextSidebarOpen={contextSidebarOpen}
- onContextSidebarOpenChange={handleContextSidebarOpenChange}
+ renderContextUsage={renderContextUsage}
variant={composerVariant}
- surfaceRef={composerSurfaceRef}
+ surfaceRef={setComposerSurface}
slashCommands={availableSlashCommands}
onMentionSearch={requestMentionCatalogs}
cliApps={cliApps}
@@ -1433,13 +1435,7 @@ export function ThreadShell({
modelNeedsSetup={modelBadge.needsSetup}
onModelBadgeClick={modelBadge.needsSetup ? onOpenModelSettings : undefined}
onManageModels={onOpenModelSettings}
- contextUsage={composerContextUsage}
- recentRoundUsage={composerRoundUsage}
- contextSnapshots={contextGraphSnapshots}
- onOpenContextFile={handleOpenFilePreview}
- contextSidebarHost={contextSidebarHost}
- contextSidebarOpen={contextSidebarOpen}
- onContextSidebarOpenChange={handleContextSidebarOpenChange}
+ renderContextUsage={renderContextUsage}
variant="hero"
slashCommands={availableSlashCommands}
onMentionSearch={requestMentionCatalogs}
@@ -1447,7 +1443,7 @@ export function ThreadShell({
mcpPresets={mcpPresets}
sessions={mentionSessions}
skills={skills}
- surfaceRef={composerSurfaceRef}
+ surfaceRef={setComposerSurface}
onInspectAttachment={inspectAttachment}
onTranscribeAudio={transcribeAudio}
goalState={currentGoalState}
@@ -1585,17 +1581,28 @@ export function ThreadShell({
{headerPortalTarget && headerActive
? createPortal(threadHeader, headerPortalTarget)
: null}
- {createPortal(
- <div
- hidden={!composerActive}
- aria-hidden={!composerActive}
- data-testid={composerActive ? "active-pane-composer" : undefined}
- data-active-composer={composerActive || undefined}
- >
- {composer}
- </div>,
- composerMount,
- )}
+ <ComposerUsagePopover
+ sessionKey={previewSessionKey}
+ context={composerContextUsage}
+ rounds={composerRoundUsage}
+ snapshots={contextGraphSnapshots}
+ sidebarHost={contextSidebarHost}
+ open={contextSidebarOpen}
+ onOpenChange={handleContextSidebarOpenChange}
+ onOpenFile={handleOpenFilePreview}
+ >
+ {(renderContextUsage) => createPortal(
+ <div
+ hidden={!composerActive}
+ aria-hidden={!composerActive}
+ data-testid={composerActive ? "active-pane-composer" : undefined}
+ data-active-composer={composerActive || undefined}
+ >
+ {composer(renderContextUsage)}
+ </div>,
+ composerMount,
+ )}
+ </ComposerUsagePopover>
{activePreview && previewSessionKey ? (
<FileActionsProvider key={previewSessionKey} value={fileActions}>
<PreviewPane
diff --git a/webui/src/components/workbench/PaneWorkbench.tsx b/webui/src/components/workbench/PaneWorkbench.tsx
index 3f2a64756..d51fc8cb2 100644
--- a/webui/src/components/workbench/PaneWorkbench.tsx
+++ b/webui/src/components/workbench/PaneWorkbench.tsx
@@ -49,6 +49,7 @@ export interface WorkbenchPane {
interface PaneRenderContext {
active: boolean;
+ multiplePanes: boolean;
headerPortalTarget: HTMLElement | null | undefined;
composerPortalTarget: HTMLElement | null | undefined;
navigationFrame: HTMLElement | null | undefined;
@@ -725,6 +726,7 @@ export function PaneWorkbench({
>
{renderPane(pane, {
active,
+ multiplePanes: displayedPanes.length > 1,
headerPortalTarget: chrome && displayedPanes.length > 1 ? headerPortalTarget : undefined,
composerPortalTarget: chrome ? composerPortalTarget : undefined,
navigationFrame: displayedPanes.length === 1 ? navigationFrame : undefined,
diff --git a/webui/src/dev/gallery/conversation.tsx b/webui/src/dev/gallery/conversation.tsx
index 887336cfc..e65838fd5 100644
--- a/webui/src/dev/gallery/conversation.tsx
+++ b/webui/src/dev/gallery/conversation.tsx
@@ -72,14 +72,16 @@ function ComposerPreview() {
return <div className="space-y-4">
<StatePicker label={t("previews.composer.state")} value={mode} options={["thread", "hero", "streaming", "disabled"]} onChange={setMode} />
<Button variant="outline" size="sm" onClick={() => setQuoted("组件接收状态,并把操作交给调用方。")}>{t("previews.composer.addQuote")}</Button>
- <ThreadComposer disabled={mode === "disabled"} isStreaming={mode === "streaming"} variant={mode === "hero" ? "hero" : "thread"}
- inputAriaLabel={t("previews.composer.input")} placeholder={t("previews.composer.placeholder")}
- modelLabel={selected.name} modelDetail={selected.model} modelProvider={selected.provider} modelPreset={preset}
- modelPresets={presets} onModelPresetChange={setPreset} slashCommands={commands.map((command) => ({ ...command, title: t(command.title), description: t(command.description) }))}
- contextUsage={{ contextTokens: 18_500, contextWindowTokens: 200_000 }} recentRoundUsage={rounds}
- workspaceScope={projectScope} workspaceControlsHidden quotedContext={quoted} onQuotedContextChange={setQuoted}
- onStop={() => { setMode("thread"); setSent({ kind: "stopped" }); }}
- onSend={(content, attachments) => { setSent({ kind: "sent", content, attachments: attachments?.length ?? 0 }); return true; }} />
+ <ComposerUsagePopover context={{ contextTokens: 18_500, contextWindowTokens: 200_000 }} rounds={rounds}>
+ {(renderContextUsage) => <ThreadComposer disabled={mode === "disabled"} isStreaming={mode === "streaming"} variant={mode === "hero" ? "hero" : "thread"}
+ inputAriaLabel={t("previews.composer.input")} placeholder={t("previews.composer.placeholder")}
+ modelLabel={selected.name} modelDetail={selected.model} modelProvider={selected.provider} modelPreset={preset}
+ modelPresets={presets} onModelPresetChange={setPreset} slashCommands={commands.map((command) => ({ ...command, title: t(command.title), description: t(command.description) }))}
+ renderContextUsage={renderContextUsage}
+ workspaceScope={projectScope} workspaceControlsHidden quotedContext={quoted} onQuotedContextChange={setQuoted}
+ onStop={() => { setMode("thread"); setSent({ kind: "stopped" }); }}
+ onSend={(content, attachments) => { setSent({ kind: "sent", content, attachments: attachments?.length ?? 0 }); return true; }} />}
+ </ComposerUsagePopover>
<p role="status" className="text-sm text-muted-foreground">{sent?.kind === "stopped" ? t("previews.composer.stopped")
: sent ? t("previews.composer.sent", { content: sent.content, attachments: sent.attachments ? t("previews.composer.attachments", { amount: sent.attachments }) : "" })
: t("previews.composer.hint")}</p>
diff --git a/webui/src/tests/composer-usage-popover.test.tsx b/webui/src/tests/composer-usage-popover.test.tsx
index 3c49b2c11..54ff6101c 100644
--- a/webui/src/tests/composer-usage-popover.test.tsx
+++ b/webui/src/tests/composer-usage-popover.test.tsx
@@ -1,5 +1,6 @@
-import { act, render, screen, waitFor, within } from "@testing-library/react";
+import { act, fireEvent, render, screen, waitFor, within } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
+import { createPortal } from "react-dom";
import { describe, expect, it } from "vitest";
import { ComposerUsagePopover } from "@/components/thread/ComposerUsagePopover";
import type { ContextSnapshot } from "@/lib/types";
@@ -53,8 +54,10 @@ describe("Context sidebar", () => {
const toolbar = document.createElement("span");
const footer = document.createElement("span");
document.body.append(toolbar, footer);
- const content = (host: HTMLElement) => <ComposerUsagePopover triggerHost={host} context={null} rounds={[]}
- snapshots={[first, { ...first, id: "2", usage: { prompt_tokens: 2000 } }]} />;
+ const content = (host: HTMLElement) => <ComposerUsagePopover context={null} rounds={[]}
+ snapshots={[first, { ...first, id: "2", usage: { prompt_tokens: 2000 } }]}>
+ {(renderControl) => createPortal(renderControl?.({ showLabel: false, compactLabel: false }), host)}
+ </ComposerUsagePopover>;
const view = render(content(toolbar));
await user.click(within(toolbar).getByTestId("composer-context-usage"));
const sidebar = screen.getByRole("complementary");
@@ -74,6 +77,25 @@ describe("Context sidebar", () => {
view.unmount(); toolbar.remove(); footer.remove();
});
+ it("resets session playback without replacing the open sidebar", async () => {
+ const user = userEvent.setup();
+ const content = (sessionKey: string, snapshots: ContextSnapshot[]) => (
+ <ComposerUsagePopover sessionKey={sessionKey} context={null} rounds={[]} snapshots={snapshots} />
+ );
+ const view = render(content("first-session", [first, { ...first, id: "2", usage: { prompt_tokens: 2000 } }]));
+ await user.click(screen.getByTestId("composer-context-usage"));
+ const sidebar = screen.getByRole("complementary");
+ await within(sidebar).findByRole("button", { name: "a.md" });
+ fireEvent.click(within(sidebar).getByRole("button", { name: "Play context history" }));
+ expect(within(sidebar).getByRole("progressbar")).toHaveAttribute("aria-valuenow", "10");
+ view.rerender(content("second-session", [{ ...first, id: "other", usage: { prompt_tokens: 3000 },
+ graph: { nodes: [{ path: "/other.md", name: "other.md", state: "loaded", tokens: 300 }], edges: [] } }]));
+ expect(screen.getByRole("complementary")).toBe(sidebar);
+ expect(within(sidebar).getByRole("progressbar")).toHaveAttribute("aria-valuenow", "30");
+ expect(await within(sidebar).findByRole("button", { name: "other.md" })).toBeInTheDocument();
+ expect(within(sidebar).queryByRole("button", { name: "a.md" })).not.toBeInTheDocument();
+ });
+
it("opens a pane-contained drawer with a visible close control on narrow panes", async () => {
const user = userEvent.setup();
const host = document.createElement("section");
diff --git a/webui/src/tests/pane-workbench.test.tsx b/webui/src/tests/pane-workbench.test.tsx
index 2ffce8018..bfddfb892 100644
--- a/webui/src/tests/pane-workbench.test.tsx
+++ b/webui/src/tests/pane-workbench.test.tsx
@@ -68,7 +68,7 @@ function WorkbenchHarness({
onSplitRatiosChange={onSplitRatiosChange}
renderPane={(pane, context) => (
<>
- <button type="button">Focus {pane.title}</button>
+ <button type="button" data-multiple-panes={context.multiplePanes}>Focus {pane.title}</button>
{context.headerPortalTarget && context.active ? createPortal(
context.headerActions,
context.headerPortalTarget,
@@ -114,6 +114,7 @@ describe("PaneWorkbench", () => {
onLayoutChange={vi.fn()} onPaneOrderChange={vi.fn()}
renderPane={(_pane, context) => {
expect(context.headerPortalTarget).toBeUndefined();
+ expect(context.multiplePanes).toBe(false);
return <div data-testid="local-toolbar">{context.headerActions}</div>;
}} />);
expect(screen.getByTestId("workbench-header-host")).toBeEmptyDOMElement();
@@ -165,6 +166,8 @@ describe("PaneWorkbench", () => {
const grid = screen.getByTestId("pane-grid");
expect(Array.from(grid.children).map((pane) => pane.getAttribute("aria-label")))
.toEqual(["Alpha", "Beta"]);
+ expect(screen.getByRole("button", { name: "Focus Alpha" })).toHaveAttribute("data-multiple-panes", "true");
+ expect(screen.getByRole("button", { name: "Focus Beta" })).toHaveAttribute("data-multiple-panes", "true");
expect(screen.getByLabelText("Composer Beta")).toBeVisible();
expect(screen.getByLabelText("Composer Alpha")).not.toBeVisible();
@@ -396,13 +399,15 @@ describe("PaneWorkbench", () => {
onPaneOrderChange: vi.fn(),
renderPane: (pane: { key: string; title: string }, context: {
headerActions: ReactNode;
- }) => <>{context.headerActions}<span>{pane.title}</span></>,
+ multiplePanes: boolean;
+ }) => <>{context.headerActions}<span data-multiple-panes={context.multiplePanes}>{pane.title}</span></>,
};
const { rerender } = render(<PaneWorkbench {...props} activePaneKey="gamma" />);
expect(screen.getByTestId("pane-grid").children).toHaveLength(1);
expect(screen.getByTestId("workbench-pane-gamma")).toBeInTheDocument();
+ expect(screen.getByText("gamma", { selector: "span" })).toHaveAttribute("data-multiple-panes", "false");
expect(screen.queryByRole("button", { name: "Layout" })).not.toBeInTheDocument();
expect(screen.queryByRole("button", { name: "Add pane" })).not.toBeInTheDocument();
expect(screen.queryByRole("separator")).not.toBeInTheDocument();
diff --git a/webui/src/tests/thread-composer.test.tsx b/webui/src/tests/thread-composer.test.tsx
index ee799c127..00abcaa2c 100644
--- a/webui/src/tests/thread-composer.test.tsx
+++ b/webui/src/tests/thread-composer.test.tsx
@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";
import { afterEach, describe, expect, it, vi } from "vitest";
import { ThreadComposer } from "@/components/thread/ThreadComposer";
+import { ComposerUsagePopover } from "@/components/thread/ComposerUsagePopover";
import { ComposerDraftStore } from "@/lib/composer-draft";
import { encodeImage } from "@/lib/imageEncode";
import { SESSION_DRAG_TYPE } from "@/lib/session-drag";
@@ -648,17 +649,16 @@ describe("ThreadComposer", () => {
it("shows a compact context meter beside the model selector", async () => {
render(
- <ThreadComposer
- onSend={vi.fn()}
- modelLabel="gpt-5.6-sol"
- modelPreset="gpt-5-6-sol"
- modelProvider="openai_codex"
- contextUsage={{
- contextTokens: 74_900,
- contextWindowTokens: 1_000_000,
- }}
- placeholder="Ask anything..."
- />,
+ <ComposerUsagePopover context={{ contextTokens: 74_900, contextWindowTokens: 1_000_000 }} rounds={[]}>
+ {(renderContextUsage) => <ThreadComposer
+ onSend={vi.fn()}
+ modelLabel="gpt-5.6-sol"
+ modelPreset="gpt-5-6-sol"
+ modelProvider="openai_codex"
+ renderContextUsage={renderContextUsage}
+ placeholder="Ask anything..."
+ />}
+ </ComposerUsagePopover>,
);
const context = screen.getByTestId("composer-context-usage");
@@ -683,11 +683,13 @@ describe("ThreadComposer", () => {
moveTo: vi.fn(), lineTo: vi.fn(), stroke: vi.fn(), arc: vi.fn(), fill: vi.fn(),
roundRect: vi.fn(), fillText: vi.fn(), measureText: (text: string) => ({ width: text.length * 6 }),
} as unknown as CanvasRenderingContext2D);
- render(<ThreadComposer onSend={vi.fn()} contextUsage={{ contextTokens: 200, contextWindowTokens: 1000 }}
- contextSnapshots={[
+ render(<ComposerUsagePopover context={{ contextTokens: 200, contextWindowTokens: 1000 }} rounds={[]}
+ snapshots={[
{ id: "first", contextWindowTokens: 1000, usage: { prompt_tokens: 100 }, graph: { nodes: [{ path: "/a.md", name: "a.md", state: "loaded", tokens: 40 }], edges: [] } },
{ id: "second", contextWindowTokens: 1000, usage: { prompt_tokens: 200 }, graph: { nodes: [{ path: "/b.md", name: "b.md", state: "loaded", tokens: 60 }], edges: [] } },
- ]} />);
+ ]}>
+ {(renderContextUsage) => <ThreadComposer onSend={vi.fn()} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>);
fireEvent.click(screen.getByTestId("composer-context-usage"));
expect(await screen.findByRole("button", { name: "b.md" })).toBeInTheDocument();
expect(screen.getByRole("progressbar", { name: "Context" })).toHaveAttribute("aria-valuenow", "20");
@@ -701,9 +703,10 @@ describe("ThreadComposer", () => {
});
it("shows the latest round cache metrics when inspecting legacy history", () => {
- render(<ThreadComposer onSend={vi.fn()} contextUsage={{ contextTokens: 14700, contextWindowTokens: 200000 }}
- recentRoundUsage={[{ inputTokens: 18000, cachedTokens: 12000 },
- { inputTokens: 29400, cachedTokens: 26180 }]} />);
+ render(<ComposerUsagePopover context={{ contextTokens: 14700, contextWindowTokens: 200000 }}
+ rounds={[{ inputTokens: 18000, cachedTokens: 12000 }, { inputTokens: 29400, cachedTokens: 26180 }]}>
+ {(renderContextUsage) => <ThreadComposer onSend={vi.fn()} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>);
fireEvent.click(screen.getByTestId("composer-context-usage"));
const meter = screen.getByRole("progressbar", { name: "Context" });
fireEvent.pointerEnter(meter.parentElement!.parentElement!);
@@ -713,8 +716,9 @@ describe("ThreadComposer", () => {
});
it("keeps context usage visible when the provider omits cache metrics", () => {
- render(<ThreadComposer onSend={vi.fn()} contextUsage={{ contextTokens: 14700, contextWindowTokens: 200000 }}
- recentRoundUsage={[{ inputTokens: 29400 }]} />);
+ render(<ComposerUsagePopover context={{ contextTokens: 14700, contextWindowTokens: 200000 }} rounds={[{ inputTokens: 29400 }]}>
+ {(renderContextUsage) => <ThreadComposer onSend={vi.fn()} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>);
fireEvent.click(screen.getByTestId("composer-context-usage"));
const meter = screen.getByRole("progressbar", { name: "Context" });
expect(meter).toHaveAttribute("aria-valuenow", "7");
@@ -1223,15 +1227,17 @@ describe("ThreadComposer", () => {
const onSend = vi.fn();
const onWorkspaceScopeChange = vi.fn();
const { container } = render(
- <ThreadComposer
- variant={variant}
- compactWhenIdle
- onSend={onSend}
- modelLabel="codex"
- workspaceScope={{ project_path: "/tmp/project", project_name: "project", access_mode: "full", restrict_to_workspace: false }}
- onWorkspaceScopeChange={onWorkspaceScopeChange}
- contextUsage={{ contextTokens: 500, contextWindowTokens: 1000 }}
- />,
+ <ComposerUsagePopover context={{ contextTokens: 500, contextWindowTokens: 1000 }} rounds={[]}>
+ {(renderContextUsage) => <ThreadComposer
+ variant={variant}
+ compactWhenIdle
+ onSend={onSend}
+ modelLabel="codex"
+ workspaceScope={{ project_path: "/tmp/project", project_name: "project", access_mode: "full", restrict_to_workspace: false }}
+ onWorkspaceScopeChange={onWorkspaceScopeChange}
+ renderContextUsage={renderContextUsage}
+ />}
+ </ComposerUsagePopover>,
);
const form = container.querySelector("form")!;
const input = screen.getByRole("textbox");
@@ -1276,9 +1282,11 @@ describe("ThreadComposer", () => {
vi.spyOn(HTMLFormElement.prototype, "getBoundingClientRect").mockReturnValue(rect({ width: 320, height: 160 }));
const scope = { project_path: "/srv/workspace", project_name: "workspace", access_mode: "full" as const };
const onWorkspaceScopeChange = vi.fn();
- const { container } = render(<ThreadComposer variant={variant} onSend={vi.fn()} workspaceScope={scope}
- workspaceDefaultScope={scope} {...workspacePickerProps(scope)} workspaceControls={{ can_change_project: true }}
- onWorkspaceScopeChange={onWorkspaceScopeChange} contextUsage={{ contextTokens: 500, contextWindowTokens: 1000 }} />);
+ const { container } = render(<ComposerUsagePopover context={{ contextTokens: 500, contextWindowTokens: 1000 }} rounds={[]}>
+ {(renderContextUsage) => <ThreadComposer variant={variant} onSend={vi.fn()} workspaceScope={scope}
+ workspaceDefaultScope={scope} {...workspacePickerProps(scope)} workspaceControls={{ can_change_project: true }}
+ onWorkspaceScopeChange={onWorkspaceScopeChange} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>);
const meta = container.querySelector(".thread-composer-meta")!;
const workspace = screen.getByRole("button", { name: "Switch directory" });
const access = screen.getByRole("button", { name: "Workspace access mode: Full Access" });
@@ -1304,14 +1312,10 @@ describe("ThreadComposer", () => {
const user = userEvent.setup();
const onSend = vi.fn();
render(
- <ThreadComposer
- onSend={onSend}
- contextUsage={{ contextTokens: 10000, contextWindowTokens: 200000 }}
- recentRoundUsage={[{
- inputTokens: 10000,
- cachedTokens: 8000,
- }]}
- />,
+ <ComposerUsagePopover context={{ contextTokens: 10000, contextWindowTokens: 200000 }}
+ rounds={[{ inputTokens: 10000, cachedTokens: 8000 }]}>
+ {(renderContextUsage) => <ThreadComposer onSend={onSend} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>,
);
const trigger = screen.getByTestId("composer-context-usage");
await user.click(trigger);
@@ -1340,7 +1344,9 @@ describe("ThreadComposer", () => {
() => rect({ width, height: 160 }),
);
const user = userEvent.setup();
- render(<ThreadComposer onSend={vi.fn()} contextUsage={{ contextTokens: 500, contextWindowTokens: 1000 }} />);
+ render(<ComposerUsagePopover context={{ contextTokens: 500, contextWindowTokens: 1000 }} rounds={[]}>
+ {(renderContextUsage) => <ThreadComposer onSend={vi.fn()} renderContextUsage={renderContextUsage} />}
+ </ComposerUsagePopover>);
await user.click(screen.getByTestId("composer-context-usage"));
expect(screen.getByRole("dialog")).toHaveClass("mt-auto");
diff --git a/webui/src/tests/thread-shell.test.tsx b/webui/src/tests/thread-shell.test.tsx
index 2eb5fa88e..ae44dfe76 100644
--- a/webui/src/tests/thread-shell.test.tsx
+++ b/webui/src/tests/thread-shell.test.tsx
@@ -1026,10 +1026,13 @@ describe("ThreadShell", () => {
event: "context_compaction", chat_id: "usage-chart",
compaction_id: "success", phase: "succeeded",
}));
+ expect(screen.getByTestId("composer-context-usage")).toHaveAttribute("aria-expanded", "true");
+ expect(screen.getByRole("progressbar", { name: "Context" })).not.toHaveAttribute("aria-valuenow");
+ fireEvent.click(screen.getByTestId("composer-context-usage"));
await waitFor(() => expect(screen.queryByTestId("composer-context-usage")).not.toBeInTheDocument());
});
- it("closes the graph on session switch and reopens with the new session context", async () => {
+ it.each([false, true])("switches context in the same side slot unless multiple panes are visible (%s)", async (multiplePanes) => {
const geometry = vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockImplementation(function (this: HTMLElement) {
const bottom = this.classList.contains("thread-preview-layout") ? 900
: this.classList.contains("thread-composer-surface") && this.isConnected ? 880 : 0;
@@ -1046,7 +1049,7 @@ describe("ThreadShell", () => {
const footer = document.createElement("div");
document.body.append(footer);
const view = render(wrap(client, <ThreadShell
- composerPortalTarget={footer}
+ composerPortalTarget={footer} multiplePanes={multiplePanes}
session={session("live-usage")} title="Live usage" onToggleSidebar={() => {}}
settingsSnapshot={modelSettings("test-model", "deepseek")}
/>));
@@ -1066,27 +1069,48 @@ describe("ThreadShell", () => {
fireEvent.click(trigger);
expect(await screen.findByRole("button", { name: "first.md" })).toBeInTheDocument();
expect((host as HTMLElement).style.getPropertyValue("--sidebar-bottom-inset")).toBe("20px");
+ const sidebar = screen.getByTestId("context-sidebar");
await act(async () => view.rerender(wrap(client, <ThreadShell
- composerPortalTarget={footer}
+ composerPortalTarget={footer} multiplePanes={multiplePanes}
session={session("other-usage")} title="Other usage" onToggleSidebar={() => {}}
settingsSnapshot={modelSettings("test-model", "deepseek")}
/>)));
+ expect(screen.queryByRole("button", { name: "first.md" })).not.toBeInTheDocument();
+ if (!multiplePanes) {
+ expect(screen.getByTestId("context-sidebar")).toBe(sidebar);
+ expect(screen.getByRole("progressbar", { name: "Context" })).not.toHaveAttribute("aria-valuenow");
+ expect((host as HTMLElement).style.getPropertyValue("--sidebar-bottom-inset")).toBe("20px");
+ }
act(() => client._emitChat("other-usage", {
event: "model_request", chat_id: "other-usage", turn_id: "other-turn", request_id: "other", run_id: "other-run",
phase: "completed", sequence: 1, turn_seq: 1, context_window_tokens: 1000,
usage: { prompt_tokens: 200, context_tokens: 200 },
+ request_usage: { prompt_tokens: 200, context_tokens: 200 },
context_graph: { nodes: [{ path: "/other.md", name: "other.md", state: "loaded", tokens: 60 }], edges: [] },
}));
const newInput = screen.getByRole("textbox");
expect(newInput).not.toBe(input);
- await waitFor(() => expect(screen.queryByTestId("context-sidebar")).not.toBeInTheDocument());
- expect(host).not.toHaveAttribute("data-preview-open");
- expect(footer).toContainElement(newInput);
- fireEvent.click(screen.getByTestId("composer-context-usage"));
+ if (multiplePanes) {
+ await waitFor(() => expect(screen.queryByTestId("context-sidebar")).not.toBeInTheDocument());
+ expect(host).not.toHaveAttribute("data-preview-open");
+ expect(footer).toContainElement(newInput);
+ fireEvent.click(screen.getByTestId("composer-context-usage"));
+ } else {
+ expect(screen.getByTestId("context-sidebar")).toBe(sidebar);
+ }
expect(await screen.findByRole("button", { name: "other.md" })).toBeInTheDocument();
expect((host as HTMLElement).style.getPropertyValue("--sidebar-bottom-inset")).toBe("20px");
- expect(screen.getByTestId("context-sidebar")).toBeInTheDocument();
+ expect(screen.getByRole("progressbar", { name: "Context" })).toHaveAttribute("aria-valuenow", "20");
expect(host.querySelector(".thread-conversation")).toContainElement(newInput);
+ fireEvent.click(screen.getByTestId("composer-context-usage"));
+ await waitFor(() => expect(screen.queryByTestId("context-sidebar")).not.toBeInTheDocument());
+ await act(async () => view.rerender(wrap(client, <ThreadShell
+ composerPortalTarget={footer} multiplePanes={multiplePanes}
+ session={session("live-usage")} title="Live usage" onToggleSidebar={() => {}}
+ settingsSnapshot={modelSettings("test-model", "deepseek")}
+ />)));
+ expect(host).not.toHaveAttribute("data-preview-open");
+ expect(screen.queryByTestId("context-sidebar")).not.toBeInTheDocument();
view.unmount();
footer.remove();
geometry.mockRestore();