Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/desktop/e2e-budget.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"electron": "needs a second real Session (Host round trip) to switch to; the focus and draft-restore halves alone would not earn a window"
},
"session-workbar.spec.ts": {
"tests": 5,
"electron": "Git changes re-read on window focus, terminal PTY ownership across Sessions, Side Chat's fork lifecycle, and a first send that has to reach the Host; the composer-usage test is renderer-only and rides along on those windows until app-shell.tsx's composer-to-workbar wiring has a story host"
"tests": 6,
"electron": "Git changes re-read on window focus, terminal PTY ownership across Sessions, Side Chat's fork lifecycle, a first send that has to reach the Host, and per-Session collapse persisted across a renderer reload; the composer-usage test is renderer-only and rides along on those windows until app-shell.tsx's composer-to-workbar wiring has a story host"
},
"settings.spec.ts": {
"tests": 4,
Expand Down
11 changes: 7 additions & 4 deletions apps/desktop/stories/app-shell.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import { WorkbarSurface } from '../src/renderer/features/workbar/stories';
import {
createFakeWorkbarServices,
createSessionWorkbarPanelsState,
isSessionWorkbarCollapsed,
reduceWorkbarLayout,
SESSION_BOTTOM_PANEL_DEFAULT_HEIGHT,
SESSION_WORKBAR_DEFAULT_WIDTH,
Expand Down Expand Up @@ -2971,7 +2972,8 @@ export const RailStaysOnTheVisiblePrompt: Story = {
const workbarLayoutWithOneFace: WorkbarLayoutState = reduceWorkbarLayout(
{
panels: createSessionWorkbarPanelsState(),
rightCollapsed: true,
activeSessionId: 'session-active',
collapsedBySession: {},
bottomOpen: false,
rightWidth: SESSION_WORKBAR_DEFAULT_WIDTH,
bottomHeight: SESSION_BOTTOM_PANEL_DEFAULT_HEIGHT,
Expand All @@ -2983,12 +2985,13 @@ function WorkbarInShell() {
const [layout, dispatch] = useReducer(reduceWorkbarLayout, workbarLayoutWithOneFace);
const collapseRight = (collapsed: boolean) =>
dispatch({ type: 'collapse', placement: 'right', collapsed });
const rightCollapsed = isSessionWorkbarCollapsed(layout);
return (
<ToastProvider>
<WorkbarServicesProvider services={createFakeWorkbarServices()}>
<ComposedShell
workbarCollapsed={layout.rightCollapsed}
onToggleWorkbar={() => collapseRight(!layout.rightCollapsed)}
workbarCollapsed={rightCollapsed}
onToggleWorkbar={() => collapseRight(!rightCollapsed)}
detailChildren={
<div
className="maka-detail-with-artifacts"
Expand All @@ -3002,7 +3005,7 @@ function WorkbarInShell() {
hidden={false}
onDismissPanel={() => collapseRight(true)}
panelsState={layout.panels}
rightCollapsed={layout.rightCollapsed}
rightCollapsed={rightCollapsed}
bottomOpen={layout.bottomOpen}
onActivateTab={(placement, tabId) =>
dispatch({ type: 'activate', placement, tabId })
Expand Down