diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts
index 0c885d29ad5..46cf4f252ad 100644
--- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts
+++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts
@@ -127,6 +127,97 @@ test.describe(
await expect(page.getByTestId('integrated-tab-bar-actions')).toBeVisible()
})
+ test('shrinks a maximized panel to stay inside a narrowed window', async ({
+ page
+ }) => {
+ await page.setViewportSize({ width: 1600, height: 900 })
+ await bootAgentApp(page, true)
+
+ await page
+ .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true })
+ .click()
+ const panel = page.getByTestId('docked-agent-panel')
+ await expect(panel).toBeVisible()
+
+ await panel
+ .getByRole('button', { name: enMessages.agent.maximize })
+ .click()
+ await expect
+ .poll(async () => (await panel.boundingBox())?.width ?? 0)
+ .toBe(960)
+
+ await page.setViewportSize({ width: 900, height: 900 })
+
+ await expect
+ .poll(async () => (await panel.boundingBox())?.width ?? 0)
+ .toBeLessThan(960)
+ const box = await panel.boundingBox()
+ expect(box).not.toBeNull()
+ expect(box!.x).toBeGreaterThanOrEqual(-1)
+ expect(box!.x + box!.width).toBeLessThanOrEqual(901)
+
+ // "Inside the window" is not enough on its own: a panel that ignored the
+ // sidebar and took all 900px would satisfy every bound above. Pin it
+ // against the workspace it is supposed to be reserving room for.
+ const sideToolbar = page.getByTestId('side-toolbar')
+ const railBox = await sideToolbar.boundingBox()
+ expect(railBox).not.toBeNull()
+ expect(box!.x).toBeGreaterThanOrEqual(railBox!.x + railBox!.width - 1)
+
+ // Still maximized, so the header offers to minimize rather than maximize.
+ await expect(
+ panel.getByRole('button', { name: enMessages.agent.minimize })
+ ).toBeVisible()
+ })
+
+ test('keeps the canvas toolbar clear of the sidebar as the panel squeezes it', async ({
+ page
+ }) => {
+ // 1300 puts the canvas at roughly 284px: narrower than the toolbar, so
+ // the overhang this fix prevents is actually in play, but not the
+ // degenerate case. At 900 a maximized panel leaves the canvas at zero
+ // and the toolbar collapses to 8px, which tests the unreserved-canvas
+ // gap rather than this fix. `agentPanelViewportDrag.spec.ts` owns that.
+ await page.setViewportSize({ width: 1300, height: 900 })
+ await bootAgentApp(page, true)
+
+ await page
+ .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true })
+ .click()
+ const panel = page.getByTestId('docked-agent-panel')
+ await expect(panel).toBeVisible()
+ await panel
+ .getByRole('button', { name: enMessages.agent.maximize })
+ .click()
+
+ const toolbar = page.getByRole('toolbar', {
+ name: enMessages.graphCanvasMenu.canvasToolbar
+ })
+ const sideToolbar = page.getByTestId('side-toolbar')
+ await expect(toolbar).toBeVisible()
+
+ const toolbarBox = await toolbar.boundingBox()
+ const sideToolbarBox = await sideToolbar.boundingBox()
+ expect(toolbarBox).not.toBeNull()
+ expect(sideToolbarBox).not.toBeNull()
+
+ // Both edges matter. Checking only the left edge passes a toolbar that
+ // overhangs the other way, out from under the canvas and beneath the
+ // expanded panel, which is the case this fix is actually about.
+ expect(toolbarBox!.x).toBeGreaterThanOrEqual(
+ sideToolbarBox!.x + sideToolbarBox!.width - 1
+ )
+ // Position alone is satisfied by a toolbar squeezed to nothing, so prove
+ // the controls at both ends survived and are still operable.
+ expect(toolbarBox!.width).toBeGreaterThan(64)
+ await expect(
+ toolbar.getByRole('button', { name: enMessages.zoomControls.label })
+ ).toBeVisible()
+ await toolbar
+ .getByRole('button', { name: enMessages.graphCanvasMenu.fitView })
+ .click()
+ })
+
test('restores an open panel after a browser reload', async ({ page }) => {
await bootAgentApp(page, true)
diff --git a/src/components/LiteGraphCanvasSplitterOverlay.test.ts b/src/components/LiteGraphCanvasSplitterOverlay.test.ts
index 05160888df4..866d031968b 100644
--- a/src/components/LiteGraphCanvasSplitterOverlay.test.ts
+++ b/src/components/LiteGraphCanvasSplitterOverlay.test.ts
@@ -1,7 +1,7 @@
import { createTestingPinia } from '@pinia/testing'
import { render, screen } from '@testing-library/vue'
import { readFileSync } from 'fs'
-import { setActivePinia } from 'pinia'
+import { getActivePinia, setActivePinia } from 'pinia'
import { resolve } from 'path'
import { describe, expect, it, vi } from 'vitest'
import { nextTick } from 'vue'
@@ -12,7 +12,12 @@ import { useSettingStore } from '@/platform/settings/settingStore'
import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore'
import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore'
import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
+import { useSidebarTabStore } from '@/stores/workspace/sidebarTabStore'
+import type { SidebarTabExtension } from '@/types/extensionTypes'
+// This branch stubs the auth store directly rather than mocking `firebase/auth`
+// the way main does, so the incoming `vi.mock(import('firebase/auth'))` is
+// dropped and the existing stub kept.
vi.mock('@/stores/authStore', () => ({
useAuthStore: vi.fn(() => ({ currentUser: null, loading: false }))
}))
@@ -120,6 +125,42 @@ describe('LiteGraphCanvasSplitterOverlay', () => {
expect(screen.getByTestId('topmenu')).toBeInTheDocument()
})
+ it('reserves room for the sidebar so the Agent panel stops before it', async () => {
+ const agentPanelStore = useAgentPanelStore()
+ const sidebarTabStore = useSidebarTabStore()
+ const i18n = createI18n({
+ legacy: false,
+ locale: 'en',
+ messages: { en: { sideToolbar: { sidebar: 'Sidebar' } } }
+ })
+
+ render(LiteGraphCanvasSplitterOverlay, {
+ global: {
+ plugins: [getActivePinia()!, i18n],
+ stubs: { Splitter: true, SplitterPanel: true }
+ }
+ })
+
+ window.innerWidth = 1200
+ window.dispatchEvent(new Event('resize'))
+ agentPanelStore.toggleMaximize()
+ await nextTick()
+ const widthWithoutSidebar = agentPanelStore.width
+
+ sidebarTabStore.sidebarTabs = [
+ { id: 'probe', title: 'Probe' } as SidebarTabExtension
+ ]
+ sidebarTabStore.activeSidebarTabId = 'probe'
+ await nextTick()
+
+ expect(agentPanelStore.width).toBeLessThan(widthWithoutSidebar)
+
+ sidebarTabStore.activeSidebarTabId = null
+ await nextTick()
+
+ expect(agentPanelStore.width).toBe(widthWithoutSidebar)
+ })
+
it('refreshes the splitter only when the Agent panel becomes visible', async () => {
const agentPanelStore = useAgentPanelStore()
agentPanelStore.enabled = true
diff --git a/src/components/LiteGraphCanvasSplitterOverlay.vue b/src/components/LiteGraphCanvasSplitterOverlay.vue
index cb7c834aa47..2f4a661e80d 100644
--- a/src/components/LiteGraphCanvasSplitterOverlay.vue
+++ b/src/components/LiteGraphCanvasSplitterOverlay.vue
@@ -150,7 +150,7 @@ import { storeToRefs } from 'pinia'
import Splitter from 'primevue/splitter'
import type { SplitterResizeStartEvent } from 'primevue/splitter'
import SplitterPanel from 'primevue/splitterpanel'
-import { computed } from 'vue'
+import { computed, watchEffect } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppMode } from '@/composables/useAppMode'
@@ -158,7 +158,9 @@ import {
BUILDER_MIN_SIZE,
CENTER_PANEL_SIZE,
SIDEBAR_MIN_SIZE,
- SIDE_PANEL_SIZE
+ SIDEBAR_MIN_WIDTH,
+ SIDE_PANEL_SIZE,
+ SIDE_TOOLBAR_WIDTH
} from '@/constants/splitterConstants'
import { useSettingStore } from '@/platform/settings/settingStore'
import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore'
@@ -223,6 +225,23 @@ const sidebarPanelVisible = computed(
() => activeSidebarTab.value !== null && !isBuilderMode.value
)
+/**
+ * The sidebar can never be squeezed past `min-w-78`, so it and the toolbar
+ * rail are the floor the agent panel has to respect. Feeding the floor rather
+ * than the sidebar's live width keeps this one-way: a panel that shrank would
+ * otherwise widen the sidebar and shrink itself again.
+ */
+watchEffect(() => {
+ agentPanelStore.setReservedWorkspaceWidth(
+ SIDE_TOOLBAR_WIDTH +
+ (sidebarPanelVisible.value &&
+ !focusMode.value &&
+ !agentNodeSelectionActive.value
+ ? SIDEBAR_MIN_WIDTH
+ : 0)
+ )
+})
+
const firstPanelVisible = computed(
() => sidebarLocation.value === 'left' || showOffsideSplitter.value
)
diff --git a/src/components/graph/GraphCanvasMenu.vue b/src/components/graph/GraphCanvasMenu.vue
index 94bcb71e722..53e7acea596 100644
--- a/src/components/graph/GraphCanvasMenu.vue
+++ b/src/components/graph/GraphCanvasMenu.vue
@@ -9,80 +9,86 @@
@click="hideModal"
>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/constants/splitterConstants.ts b/src/constants/splitterConstants.ts
index 792a5a88877..4834fafea36 100644
--- a/src/constants/splitterConstants.ts
+++ b/src/constants/splitterConstants.ts
@@ -9,3 +9,12 @@ export const SIDEBAR_MIN_SIZE = 10
/** Minimum panel size (%) for the builder panel */
export const BUILDER_MIN_SIZE = 15
+
+/** Minimum sidebar panel width (px). The twin of `min-w-78` on `.side-bar-panel`. */
+export const SIDEBAR_MIN_WIDTH = 312
+
+/**
+ * Width (px) of the side toolbar rail: `--sidebar-default-floating-width` plus
+ * `--sidebar-padding` on each side, which is the wider connected variant.
+ */
+export const SIDE_TOOLBAR_WIDTH = 56
diff --git a/src/workbench/extensions/agent/components/agent/DockedAgentPanel.test.ts b/src/workbench/extensions/agent/components/agent/DockedAgentPanel.test.ts
index 96d43e04b1e..91dae1a1b89 100644
--- a/src/workbench/extensions/agent/components/agent/DockedAgentPanel.test.ts
+++ b/src/workbench/extensions/agent/components/agent/DockedAgentPanel.test.ts
@@ -1,7 +1,7 @@
import userEvent from '@testing-library/user-event'
import { fireEvent, render, screen } from '@testing-library/vue'
import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest'
import { defineComponent, nextTick, ref } from 'vue'
import { i18n } from '@/i18n'
@@ -133,6 +133,14 @@ describe('DockedAgentPanel', () => {
})
it('resizes via pointer drag on the handle, clamped to the width bounds', async () => {
+ // Wide enough that the upper bound is the panel max, not the viewport.
+ // Restored below: leaving it set makes every later test in this file
+ // depend on execution order.
+ const realInnerWidth = window.innerWidth
+ onTestFinished(() => {
+ window.innerWidth = realInnerWidth
+ })
+ window.innerWidth = 1920
const store = openPanel()
const user = userEvent.setup()
renderPanel()
diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts b/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts
index cf08c8ec2a8..c0d614e9944 100644
--- a/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts
+++ b/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts
@@ -272,17 +272,74 @@ describe('agentPanelStore open-state persistence', () => {
expect(store.gateSettled).toBe(false)
expect(localStorage.getItem(OPEN_STORAGE_KEY)).toBeNull()
})
+})
- it('clamps setWidth to the panel min and max bounds', () => {
- const store = useAgentPanelStore()
+describe('agentPanelStore width', () => {
+ /** Side toolbar rail + sidebar minimum. */
+ const SIDEBAR_OPEN = 368
+ /** Side toolbar rail alone, with no sidebar tab showing. */
+ const SIDEBAR_CLOSED = 56
- store.setWidth(100)
- expect(store.width).toBe(420)
+ function resizeWindowTo(px: number): void {
+ window.innerWidth = px
+ window.dispatchEvent(new Event('resize'))
+ }
- store.setWidth(2000)
- expect(store.width).toBe(960)
+ beforeEach(() => {
+ resizeWindowTo(1920)
})
+ it.for([
+ {
+ requested: 100,
+ windowWidth: 1920,
+ reserved: SIDEBAR_OPEN,
+ expected: 420
+ },
+ {
+ requested: 2000,
+ windowWidth: 1920,
+ reserved: SIDEBAR_OPEN,
+ expected: 960
+ },
+ {
+ requested: 700,
+ windowWidth: 1920,
+ reserved: SIDEBAR_OPEN,
+ expected: 700
+ },
+ {
+ requested: 2000,
+ windowWidth: 1200,
+ reserved: SIDEBAR_OPEN,
+ expected: 832
+ },
+ {
+ requested: 2000,
+ windowWidth: 1200,
+ reserved: SIDEBAR_CLOSED,
+ expected: 960
+ },
+ {
+ requested: 2000,
+ windowWidth: 900,
+ reserved: SIDEBAR_CLOSED,
+ expected: 844
+ },
+ { requested: 2000, windowWidth: 700, reserved: SIDEBAR_OPEN, expected: 332 }
+ ] as const)(
+ 'clamps a requested $requested to $expected in a $windowWidth window reserving $reserved',
+ ({ requested, windowWidth, reserved, expected }) => {
+ resizeWindowTo(windowWidth)
+ const store = useAgentPanelStore()
+ store.setReservedWorkspaceWidth(reserved)
+
+ store.setWidth(requested)
+
+ expect(store.width).toBe(expected)
+ }
+ )
+
it('toggleMaximize flips width between the min and max bounds', () => {
const store = useAgentPanelStore()
expect(store.isMaximized).toBe(false)
@@ -295,4 +352,69 @@ describe('agentPanelStore open-state persistence', () => {
expect(store.width).toBe(420)
expect(store.isMaximized).toBe(false)
})
+
+ it('shrinks a maximized panel to fit a narrowed window and restores it', () => {
+ const store = useAgentPanelStore()
+ store.toggleMaximize()
+
+ resizeWindowTo(1200)
+ expect(store.width).toBe(832)
+ expect(store.isMaximized).toBe(true)
+
+ resizeWindowTo(1920)
+ expect(store.width).toBe(960)
+ })
+
+ it('gives a maximized panel the room back when the sidebar closes', () => {
+ const store = useAgentPanelStore()
+ store.toggleMaximize()
+ resizeWindowTo(1200)
+ expect(store.width).toBe(832)
+
+ store.setReservedWorkspaceWidth(SIDEBAR_CLOSED)
+
+ expect(store.width).toBe(960)
+ })
+
+ it('shrinks a panel that the opening sidebar would otherwise meet', () => {
+ const store = useAgentPanelStore()
+ store.setReservedWorkspaceWidth(SIDEBAR_CLOSED)
+ resizeWindowTo(1200)
+ store.setWidth(900)
+ expect(store.width).toBe(900)
+
+ store.setReservedWorkspaceWidth(SIDEBAR_OPEN)
+
+ expect(store.width).toBe(832)
+ })
+
+ it('follows a window too narrow for the panel minimum instead of leaving it', () => {
+ const store = useAgentPanelStore()
+ store.toggleMaximize()
+
+ resizeWindowTo(600)
+
+ expect(store.width).toBe(232)
+ })
+
+ it('restores the dragged width once the window has room for it again', () => {
+ const store = useAgentPanelStore()
+ resizeWindowTo(1000)
+
+ store.setWidth(900)
+ expect(store.width).toBe(632)
+
+ resizeWindowTo(1400)
+ expect(store.width).toBe(900)
+ })
+
+ it('drops the maximized state when the user drags the panel', () => {
+ const store = useAgentPanelStore()
+ store.toggleMaximize()
+
+ store.setWidth(600)
+
+ expect(store.isMaximized).toBe(false)
+ expect(store.width).toBe(600)
+ })
})
diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts b/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts
index af78c83c4ab..f6b9096195d 100644
--- a/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts
+++ b/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts
@@ -1,7 +1,12 @@
-import { useLocalStorage } from '@vueuse/core'
+import { useLocalStorage, useWindowSize } from '@vueuse/core'
+import { clamp } from 'es-toolkit'
import { defineStore } from 'pinia'
import { computed, ref, watch } from 'vue'
+import {
+ SIDEBAR_MIN_WIDTH,
+ SIDE_TOOLBAR_WIDTH
+} from '@/constants/splitterConstants'
import { useTelemetry } from '@/platform/telemetry'
import type {
AgentPanelCloseSource,
@@ -33,7 +38,14 @@ export const useAgentPanelStore = defineStore('agentPanel', () => {
writeDefaults: false
})
const gateSettled = ref(false)
- const width = ref(PANEL_MIN_WIDTH)
+ const maximized = ref(false)
+ const draggedWidth = ref(PANEL_MIN_WIDTH)
+ /**
+ * Width the workspace left of the panel needs: the side toolbar, plus the
+ * sidebar when one is open. The layout that owns those keeps it current, so
+ * the panel gives way the moment it would meet the sidebar.
+ */
+ const reservedWorkspaceWidth = ref(SIDE_TOOLBAR_WIDTH + SIDEBAR_MIN_WIDTH)
const dismissedSelectionSignature = ref(null)
const workflowStore = useWorkflowStore()
const targetTracking = ref({ mode: 'uninitialized' })
@@ -103,7 +115,28 @@ export const useAgentPanelStore = defineStore('agentPanel', () => {
useTelemetry()?.trackAgentPanelOpened({ source: 'restored' })
})
- const isMaximized = computed(() => width.value === PANEL_MAX_WIDTH)
+ const { width: windowWidth } = useWindowSize()
+
+ /**
+ * Falls below `PANEL_MIN_WIDTH` when the window leaves less room than that.
+ * A panel narrower than its minimum still beats one that leaves the window.
+ */
+ const maxWidth = computed(() =>
+ clamp(windowWidth.value - reservedWorkspaceWidth.value, 0, PANEL_MAX_WIDTH)
+ )
+
+ /**
+ * The rendered width. Narrowing the window clamps it; widening restores the
+ * width the user asked for, so a maximized panel never leaves the viewport.
+ */
+ const width = computed(() =>
+ Math.min(
+ maxWidth.value,
+ maximized.value ? PANEL_MAX_WIDTH : draggedWidth.value
+ )
+ )
+
+ const isMaximized = computed(() => maximized.value)
function open(
source: AgentPanelOpenedMetadata['source'] = 'topbar_button'
@@ -136,12 +169,18 @@ export const useAgentPanelStore = defineStore('agentPanel', () => {
else open()
}
+ function setReservedWorkspaceWidth(px: number): void {
+ reservedWorkspaceWidth.value = Math.max(0, px)
+ }
+
function setWidth(px: number): void {
- width.value = Math.min(PANEL_MAX_WIDTH, Math.max(PANEL_MIN_WIDTH, px))
+ maximized.value = false
+ draggedWidth.value = clamp(px, PANEL_MIN_WIDTH, PANEL_MAX_WIDTH)
}
function toggleMaximize(): void {
- setWidth(isMaximized.value ? PANEL_MIN_WIDTH : PANEL_MAX_WIDTH)
+ maximized.value = !maximized.value
+ if (!maximized.value) draggedWidth.value = PANEL_MIN_WIDTH
}
return {
@@ -168,6 +207,7 @@ export const useAgentPanelStore = defineStore('agentPanel', () => {
close,
suppressRestoredOpen,
setWidth,
+ setReservedWorkspaceWidth,
toggleMaximize
}
})
diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelStoreId.test.ts b/src/workbench/extensions/agent/stores/agent/agentPanelStoreId.test.ts
index baf8f9ff3cf..adba1f0a96c 100644
--- a/src/workbench/extensions/agent/stores/agent/agentPanelStoreId.test.ts
+++ b/src/workbench/extensions/agent/stores/agent/agentPanelStoreId.test.ts
@@ -43,7 +43,9 @@ describe('the agentPanel store id', () => {
expect(typeof store.width).toBe('number')
expect(Number.isFinite(store.width)).toBe(true)
expect(typeof store.toggleMaximize).toBe('function')
- expect(Object.keys(pinia.state.value.agentPanel)).toContain('width')
+ expect(Object.keys(pinia.state.value.agentPanel)).toContain(
+ 'targetTracking'
+ )
})
it('maximizes the panel through the store the dock mount already registered', () => {