diff --git a/.playwright/scripts/__tests__/extensionContributions.e2e.mjs b/.playwright/scripts/__tests__/extensionContributions.e2e.mjs
index 3743126fa..d334f7673 100644
--- a/.playwright/scripts/__tests__/extensionContributions.e2e.mjs
+++ b/.playwright/scripts/__tests__/extensionContributions.e2e.mjs
@@ -49,6 +49,15 @@ test('plugin-owned preferences activate contributions, yield native content and
   await expect(alpha.getByText('tests.alpha content')).toBeVisible()
   await expect(nativeFooter()).toHaveCount(0)
   const identity = await alpha.evaluate(() => window.fixture.instance)
+  await page.getByTestId('context-panel-toggle').click()
+  await page.getByTestId('context-panel-swap').click()
+  await page.getByTestId('context-panel-maximize').click()
+  await expect.poll(() => visible('alpha')).toBe(false)
+  await page.getByTestId('context-panel-maximize').click()
+  await expect.poll(() => visible('alpha')).toBe(true)
+  expect(await alpha.evaluate(() => window.fixture.instance)).toBe(identity)
+  await page.getByTestId('context-panel-swap').click()
+  await page.getByTestId('context-panel-toggle').click()
   const alphaActions = await pluginFrame('alpha', 'actions')
   await alphaActions.getByRole('checkbox', { name: 'Content tests.alpha' }).uncheck()
   await expect(nativeFooter()).toBeVisible()
diff --git a/apps/buddy/src/app/workbench/DesktopWorkbenchArea.vue b/apps/buddy/src/app/workbench/DesktopWorkbenchArea.vue
index 47a8f15c7..3998b4093 100644
--- a/apps/buddy/src/app/workbench/DesktopWorkbenchArea.vue
+++ b/apps/buddy/src/app/workbench/DesktopWorkbenchArea.vue
@@ -3,18 +3,22 @@ import type { ComponentPublicInstance } from 'vue'
 import type { DesktopShellBindings } from '../shell/desktopShellBindings'
 import { NSpin } from 'naive-ui'
 import { computed, watch } from 'vue'
-import { RouterView } from 'vue-router'
+import { RouterView, useRoute } from 'vue-router'
 import { DesktopTaskIndexView, DesktopTaskResourcePanel } from '@/modules/tasks/ui'
 import { useDesktopUi } from '@/shared/ui/desktopUiContext'
 import WorkbenchLayout from '@/workbench/browser/layout/WorkbenchLayout.vue'
 import WorkbenchMountPoint from '@/workbench/browser/mounts/WorkbenchMountPoint.vue'
 import { useWorkbench } from '@/workbench/browser/workbenchContext'
 import WorkbenchLayoutNode from '@/workbench/browser/WorkbenchLayoutNode.vue'
+import WorkbenchResourcePanelActions from '@/workbench/browser/WorkbenchResourcePanelActions.vue'
 import WorkbenchSurface from '@/workbench/browser/WorkbenchSurface.vue'
 import DesktopDirectoryFileSurface from './DesktopDirectoryFileSurface.vue'
 
 const props = defineProps<{ bindings: DesktopShellBindings, tasksVisible: boolean }>()
-const { controller, layout, revision, labels } = useWorkbench()
+const { controller, layout, revision, labels, panels } = useWorkbench()
+const route = useRoute()
+const contextVisible = computed(() => (props.tasksVisible || props.bindings.contextPanelGlobal.value) && props.bindings.resources.isOpen.value)
+watch([contextVisible, () => route.path], panels.restore)
 const pendingTaskIds = computed(() => {
   void revision.value
   return [...controller.navigation.entries.values()].filter(entry => entry.status === 'loading' && entry.view.resource.scheme === 'task').map(entry => entry.view.resource.id)
@@ -49,27 +53,32 @@ function focusContext() {
 </script>
 
 <template>
-  <WorkbenchLayout v-model:sidebar-collapsed="collapsed" v-model:sidebar-width="width" :language="language" :context-visible="(tasksVisible || bindings.contextPanelGlobal.value) && bindings.resources.isOpen.value" :sidebar-collapsible="tasksVisible" :sidebar-resizable="tasksVisible">
+  <WorkbenchLayout v-model:sidebar-collapsed="collapsed" v-model:sidebar-width="width" :language="language" :context-visible="contextVisible" :context-on-left="panels.contextOnLeft.value" :context-maximized="panels.contextMaximized.value" :sidebar-collapsible="tasksVisible" :sidebar-resizable="tasksVisible">
     <template v-if="tasksVisible" #sidebar>
       <WorkbenchMountPoint target="workbench.sidebar">
         <DesktopTaskIndexView :pending-task-ids="pendingTaskIds" :index="bindings.taskIndex" :active-task-id="bindings.workbench.activeTaskId.value" @open-task="bindings.workbench.openTask" @new-task="bindings.workbench.newTask" />
       </WorkbenchMountPoint>
     </template>
-    <div v-show="tasksVisible" class="desktop-workbench-area__tasks">
-      <WorkbenchLayoutNode :node="layout.root" />
-    </div>
-    <RouterView v-if="!tasksVisible" />
+    <template #workspace>
+      <div v-show="tasksVisible" class="desktop-workbench-area__tasks">
+        <WorkbenchLayoutNode :node="layout.root" />
+      </div>
+      <RouterView v-if="!tasksVisible" />
+    </template>
     <template #context>
       <div class="desktop-workbench-area__context" data-workbench-context @focusin="focusContext" @pointerdown="focusContext">
-        <DesktopTaskResourcePanel :panel="bindings.resources" :context="bindings.resourceContext" :language="language" :visible="(tasksVisible || bindings.contextPanelGlobal.value) && bindings.resources.isOpen.value">
+        <DesktopTaskResourcePanel :panel="bindings.resources" :context="bindings.resourceContext" :language="language" :visible="contextVisible">
+          <template #header-actions>
+            <WorkbenchResourcePanelActions :language="language" :maximized="panels.contextMaximized.value" :on-left="panels.contextOnLeft.value" :can-swap="tasksVisible" @swap="panels.swap" @toggle-maximize="panels.toggleMaximize" />
+          </template>
           <template #view="{ viewId }">
-            <WorkbenchSurface :view-id="viewId" :visible="(tasksVisible || bindings.contextPanelGlobal.value) && bindings.resources.isOpen.value" />
+            <WorkbenchSurface :view-id="viewId" :visible="contextVisible" />
           </template>
           <template #file-toolbar="{ tab }">
             <div :ref="element => toolbarTarget(tab.id, element)" class="desktop-workbench-area__file-toolbar" />
           </template>
           <template #file="{ wrap, setWrap }">
-            <DesktopDirectoryFileSurface v-if="selectedFile" :view="selectedFile" :wrap="wrap" :visible="(tasksVisible || bindings.contextPanelGlobal.value) && bindings.resources.isOpen.value" @update-wrap="setWrap" />
+            <DesktopDirectoryFileSurface v-if="selectedFile" :view="selectedFile" :wrap="wrap" :visible="contextVisible" @update-wrap="setWrap" />
             <div v-else class="desktop-workbench-area__file-loading">
               <NSpin size="small" />{{ labels.loading }}
             </div>
diff --git a/apps/buddy/src/i18n/locales/en-US/tasks.ts b/apps/buddy/src/i18n/locales/en-US/tasks.ts
index 05ac90981..ca8206155 100644
--- a/apps/buddy/src/i18n/locales/en-US/tasks.ts
+++ b/apps/buddy/src/i18n/locales/en-US/tasks.ts
@@ -143,6 +143,10 @@ export default {
   'desktop.context.changeType.deleted': 'Deleted',
   'desktop.context.changeType.modified': 'Modified',
   'desktop.context.collapse': 'Collapse resource panel',
+  'desktop.context.maximize': 'Maximize',
+  'desktop.context.restore': 'Restore',
+  'desktop.context.moveToLeft': 'Move to left',
+  'desktop.context.moveToRight': 'Move to right',
   'desktop.context.empty': 'No resources are open',
   'desktop.context.editorLoadFailed': 'Could not load the difference viewer',
   'desktop.context.editorLoading': 'Loading difference viewer…',
diff --git a/apps/buddy/src/i18n/locales/zh-CN/tasks.ts b/apps/buddy/src/i18n/locales/zh-CN/tasks.ts
index 9a003752f..0c91c55cf 100644
--- a/apps/buddy/src/i18n/locales/zh-CN/tasks.ts
+++ b/apps/buddy/src/i18n/locales/zh-CN/tasks.ts
@@ -141,6 +141,10 @@ export default {
   'desktop.context.changeType.deleted': '删除',
   'desktop.context.changeType.modified': '修改',
   'desktop.context.collapse': '收起资源面板',
+  'desktop.context.maximize': '放大',
+  'desktop.context.restore': '还原',
+  'desktop.context.moveToLeft': '移到左侧',
+  'desktop.context.moveToRight': '移到右侧',
   'desktop.context.empty': '当前没有打开的资源',
   'desktop.context.editorLoadFailed': '无法加载差异查看器',
   'desktop.context.editorLoading': '正在加载差异查看器…',
diff --git a/apps/buddy/src/modules/settings/pages/DesktopSettingsLayout.vue b/apps/buddy/src/modules/settings/pages/DesktopSettingsLayout.vue
index d4485ec88..f6bbe8993 100644
--- a/apps/buddy/src/modules/settings/pages/DesktopSettingsLayout.vue
+++ b/apps/buddy/src/modules/settings/pages/DesktopSettingsLayout.vue
@@ -18,6 +18,8 @@ const { language, appSidebarCollapsed } = useDesktopUi()
         :capabilities="platformCapabilities"
       />
     </template>
-    <RouterView />
+    <template #workspace>
+      <RouterView />
+    </template>
   </WorkbenchLayout>
 </template>
diff --git a/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskContextPanel.vue b/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskContextPanel.vue
index d88cf0d6c..5c4db338e 100644
--- a/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskContextPanel.vue
+++ b/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskContextPanel.vue
@@ -20,7 +20,7 @@ const emit = defineEmits<{
   closeTab: [tabId: string]
   selectTab: [tabId: string]
 }>()
-defineSlots<{ default?: () => unknown, toolbar?: () => unknown }>()
+defineSlots<{ 'default'?: () => unknown, 'header-actions'?: () => unknown, 'toolbar'?: () => unknown }>()
 const { t } = useBuddyI18n(() => props.language)
 const actions = computed(() => [
   ...(props.canAddChanges ? [{ id: 'changes' as const, label: t('desktop.context.changes'), icon: Code16Regular }] : []),
@@ -44,6 +44,9 @@ function add(id: string) {
     <template v-if="$slots.toolbar" #toolbar>
       <slot name="toolbar" />
     </template>
+    <template v-if="$slots['header-actions']" #header-actions>
+      <slot name="header-actions" />
+    </template>
     <slot />
   </WorkbenchResourcePanel>
 </template>
diff --git a/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskResourcePanel.vue b/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskResourcePanel.vue
index b3516d150..423209164 100644
--- a/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskResourcePanel.vue
+++ b/apps/buddy/src/modules/tasks/widgets/context-panel/DesktopTaskResourcePanel.vue
@@ -58,6 +58,9 @@ function add(kind: 'changes' | 'files' | 'browser') {
 <template>
   <DesktopFileSpacePicker v-model:show="fileSpacePickerOpen" :spaces="panel.fileSpaces.value" :language="language" @select="panel.openFiles" />
   <DesktopTaskContextPanel :active-tab-id="activeTab?.id ?? null" :tabs="tabs" :language="language" :can-add-changes="panel.canAddChanges.value" :can-add-files="Boolean(panel.fileEntry.value)" @add="add" @close-tab="panel.closeTab" @select-tab="panel.selectTab">
+    <template v-if="$slots['header-actions']" #header-actions>
+      <slot name="header-actions" />
+    </template>
     <DesktopFilesContextSurface :tab="activeTab?.kind === 'files' ? activeTab : null" :files="context.files" :has-tab="panel.hasTab" :language="language" @select="panel.selectFile">
       <template #file-toolbar="bindings">
         <slot name="file-toolbar" v-bind="bindings" />
diff --git a/apps/buddy/src/workbench/browser/WorkbenchHost.vue b/apps/buddy/src/workbench/browser/WorkbenchHost.vue
index 1f566c6ca..d36f33e8f 100644
--- a/apps/buddy/src/workbench/browser/WorkbenchHost.vue
+++ b/apps/buddy/src/workbench/browser/WorkbenchHost.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { WorkbenchMountTarget } from '@buddy-shared/workbench/workbenchUi'
-import type { DragEndEvent } from '@dnd-kit/vue'
+import type { DragEndEvent, DragStartEvent } from '@dnd-kit/vue'
 import type { DropPosition, ResourceRef, WorkbenchView } from '../common/workbench'
 import type { WorkbenchController } from '../services/WorkbenchController'
 import type { WorkingCopyService } from '../services/WorkingCopyService'
@@ -13,6 +13,7 @@ import { computed, onMounted, onScopeDispose, provide, shallowRef, triggerRef }
 import { useOptionalWorkbenchUi } from '@/shared/ui/contributions/workbenchUiContext'
 import { commandLabel } from '../common/workbench'
 import { workbenchLabels } from '../common/workbenchLabels'
+import { useWorkbenchPanelPresentation } from './layout/useWorkbenchPanelPresentation'
 import WorkbenchMountPortals from './mounts/WorkbenchMountPortals.vue'
 import { useWorkbenchResize } from './useWorkbenchResize'
 import { workbenchKey } from './workbenchContext'
@@ -27,6 +28,7 @@ const ui = useOptionalWorkbenchUi()
 const plugins = createWorkbenchDragPlugins()
 const sensors = [PointerSensor.configure({ activationConstraints: () => [new PointerActivationConstraints.Distance({ value: 6 })] }), KeyboardSensor]
 const resize = useWorkbenchResize(props.controller)
+const panels = useWorkbenchPanelPresentation(props.controller, () => props.active)
 const layout = shallowRef(props.controller.layout)
 const revision = shallowRef(0)
 const labels = computed(() => workbenchLabels(props.language))
@@ -73,7 +75,7 @@ const commands = computed(() => {
 const dropPosition = shallowRef<{ paneId: string, position: DropPosition } | null>(null)
 function viewVisible(id: string): boolean {
   const view = props.controller.layout.views[id]
-  return !!view && mounts.value.has(id) && (props.active || view.location !== 'main') && props.controller.matchesViewContext(view)
+  return !!view && mounts.value.has(id) && (panels.mainVisible.value || view.location !== 'main') && props.controller.matchesViewContext(view)
 }
 function viewTarget(id: string): HTMLElement | null {
   return mounts.value.get(id) ?? null
@@ -88,13 +90,19 @@ async function execute(id: string, source: 'palette' | 'shortcut' = 'palette') {
     commandFailed.value = true
   }
 }
+function dragStart(event: DragStartEvent) {
+  dragging.value = true
+  if (event.operation.source?.type === 'workbench-task')
+    panels.beginDrag()
+}
 function dragEnd(event: DragEndEvent) {
   dragging.value = false
   const destination = dropPosition.value
+  const source = event.operation.source
+  panels.endDrag(!event.canceled && !!destination && !!source?.data.resource)
   dropPosition.value = null
   if (event.canceled || !destination)
     return
-  const source = event.operation.source
   if (source?.data.resource)
     emit('dropResource', source.data.resource as ResourceRef, destination.paneId, destination.position)
 }
@@ -138,11 +146,11 @@ onMounted(() => {
   window.addEventListener('keydown', keyboard)
 })
 onScopeDispose(() => window.removeEventListener('keydown', keyboard))
-provide(workbenchKey, { resize, controller: props.controller, copies: props.copies, layout, revision, mountPoints, registerMountPoint, labels, viewVisible, viewTarget, mountView, dropPosition })
+provide(workbenchKey, { panels, resize, controller: props.controller, copies: props.copies, layout, revision, mountPoints, registerMountPoint, labels, viewVisible, viewTarget, mountView, dropPosition })
 </script>
 
 <template>
-  <DragDropProvider :sensors="sensors" :plugins="plugins" @drag-start="dragging = true" @drag-end="dragEnd">
+  <DragDropProvider :sensors="sensors" :plugins="plugins" @drag-start="dragStart" @drag-end="dragEnd">
     <main class="workbench" :class="{ 'is-dragging': dragging, 'is-resizing': resize.active.value.length > 0 }" :style="{ '--workbench-resize-cursor': resize.cursor.value }" data-testid="workbench">
       <div v-if="backupError" class="workbench__error" role="alert">
         {{ labels.backupFailed }} <button type="button" @click="emit('retryBackup')">
diff --git a/apps/buddy/src/workbench/browser/WorkbenchResourcePanel.vue b/apps/buddy/src/workbench/browser/WorkbenchResourcePanel.vue
index ddb764960..4762724b0 100644
--- a/apps/buddy/src/workbench/browser/WorkbenchResourcePanel.vue
+++ b/apps/buddy/src/workbench/browser/WorkbenchResourcePanel.vue
@@ -2,6 +2,7 @@
 import type { Component } from 'vue'
 import type { BuddyLocale } from '@/i18n/buddyI18n'
 import { Add20Regular, Dismiss16Regular } from '@vicons/fluent'
+import { useResizeObserver } from '@vueuse/core'
 import { NPopover } from 'naive-ui'
 import { nextTick, shallowRef, useId, useTemplateRef, watch } from 'vue'
 import { useBuddyI18n } from '@/i18n/buddyI18n'
@@ -18,7 +19,7 @@ const emit = defineEmits<{
   closeTab: [tabId: string]
   selectTab: [tabId: string]
 }>()
-defineSlots<{ default?: () => unknown, toolbar?: () => unknown, icon?: (props: { tab: Tab }) => unknown }>()
+defineSlots<{ 'default'?: () => unknown, 'header-actions'?: () => unknown, 'toolbar'?: () => unknown, 'icon'?: (props: { tab: Tab }) => unknown }>()
 const { t } = useBuddyI18n(() => props.language)
 const panelId = `context-${useId()}`
 const menuOpen = shallowRef(false)
@@ -52,10 +53,12 @@ function handleTabsWheel(event: WheelEvent) {
   event.preventDefault()
   root.scrollBy({ left: event.deltaY * (event.deltaMode === 1 ? 16 : event.deltaMode === 2 ? root.clientWidth : 1) })
 }
-watch(() => [props.activeTabId, props.tabs.length], async () => {
+async function revealActiveTab() {
   await nextTick()
   tabsScrollRoot.value?.querySelector('[aria-selected="true"]')?.closest('.desktop-task-context-panel__tab')?.scrollIntoView({ block: 'nearest', inline: 'nearest' })
-})
+}
+watch(() => [props.activeTabId, props.tabs.length], revealActiveTab)
+useResizeObserver(tabsScrollRoot, revealActiveTab)
 </script>
 
 <template>
@@ -86,6 +89,9 @@ watch(() => [props.activeTabId, props.tabs.length], async () => {
           </button>
         </div>
       </NPopover>
+      <div v-if="$slots['header-actions']" class="desktop-task-context-panel__actions">
+        <slot name="header-actions" />
+      </div>
     </header>
     <div v-if="$slots.toolbar" class="desktop-task-context-panel__toolbar">
       <slot name="toolbar" />
@@ -131,6 +137,13 @@ watch(() => [props.activeTabId, props.tabs.length], async () => {
   scrollbar-width: none;
 }
 
+.desktop-task-context-panel__actions {
+  display: flex;
+  flex: none;
+  align-items: center;
+  margin: 0 0.375rem 0 auto;
+}
+
 :deep(.desktop-task-context-panel__tabs-scrollbar) {
   width: 100%;
   height: 100%;
diff --git a/apps/buddy/src/workbench/browser/WorkbenchResourcePanelActions.vue b/apps/buddy/src/workbench/browser/WorkbenchResourcePanelActions.vue
new file mode 100644
index 000000000..c77a74e52
--- /dev/null
+++ b/apps/buddy/src/workbench/browser/WorkbenchResourcePanelActions.vue
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import type { BuddyLocale } from '@/i18n/buddyI18n'
+import { NTooltip } from 'naive-ui'
+import { nextTick } from 'vue'
+import { useBuddyI18n } from '@/i18n/buddyI18n'
+import DesktopIcon from '@/shared/ui/icon/DesktopIcon.vue'
+
+const props = defineProps<{ language: BuddyLocale, maximized: boolean, onLeft: boolean, canSwap: boolean }>()
+const emit = defineEmits<{ swap: [], toggleMaximize: [] }>()
+const { t } = useBuddyI18n(() => props.language)
+
+async function swap(event: MouseEvent) {
+  const button = event.currentTarget as HTMLButtonElement
+  const restoreFocus = button.matches(':focus-visible')
+  emit('swap')
+  await nextTick()
+  if (restoreFocus)
+    button.focus({ preventScroll: true })
+}
+</script>
+
+<template>
+  <NTooltip v-if="canSwap && !maximized" :delay="350">
+    <template #trigger>
+      <button class="workbench-resource-panel-action" data-testid="context-panel-swap" type="button" :aria-label="t(onLeft ? 'desktop.context.moveToRight' : 'desktop.context.moveToLeft')" @click="swap">
+        <DesktopIcon :size="18">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
+            <path d="M4 8h16m-4-4 4 4-4 4M20 16H4m4-4-4 4 4 4" />
+          </svg>
+        </DesktopIcon>
+      </button>
+    </template>
+    {{ t(onLeft ? 'desktop.context.moveToRight' : 'desktop.context.moveToLeft') }}
+  </NTooltip>
+  <NTooltip :delay="350">
+    <template #trigger>
+      <button class="workbench-resource-panel-action" data-testid="context-panel-maximize" type="button" :aria-label="t(maximized ? 'desktop.context.restore' : 'desktop.context.maximize')" :aria-pressed="maximized" @click="emit('toggleMaximize')">
+        <DesktopIcon :size="18">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
+            <path :d="maximized ? 'm4 20 6-6m-6 0h6v6m10-16-6 6m0-6v6h6' : 'M14 4h6v6m0-6-6 6M4 14v6h6m-6 0 6-6'" />
+          </svg>
+        </DesktopIcon>
+      </button>
+    </template>
+    {{ t(maximized ? 'desktop.context.restore' : 'desktop.context.maximize') }}
+  </NTooltip>
+</template>
+
+<style scoped>
+.workbench-resource-panel-action { display: grid; width: 2rem; height: 2rem; flex: none; place-items: center; padding: 0; border: 0; border-radius: var(--buddy-icon-button-radius); background: transparent; color: var(--buddy-text-primary); cursor: pointer; }
+.workbench-resource-panel-action:hover { background: var(--buddy-state-hover); color: var(--buddy-text-strong); }
+.workbench-resource-panel-action:focus-visible { outline: 2px solid var(--buddy-focus-ring); outline-offset: -2px; }
+</style>
diff --git a/apps/buddy/src/workbench/browser/layout/WorkbenchLayout.vue b/apps/buddy/src/workbench/browser/layout/WorkbenchLayout.vue
index c24bd7a22..4db691259 100644
--- a/apps/buddy/src/workbench/browser/layout/WorkbenchLayout.vue
+++ b/apps/buddy/src/workbench/browser/layout/WorkbenchLayout.vue
@@ -1,34 +1,45 @@
 <script setup lang="ts">
+import type { ComponentPublicInstance } from 'vue'
 import type { BuddyLocale } from '@/i18n/buddyI18n'
 import { computed, nextTick, onBeforeUnmount, shallowRef, useTemplateRef } from 'vue'
 import { useBuddyI18n } from '@/i18n/buddyI18n'
 import { useWorkbenchAnchor } from '@/shared/ui/contributions/workbenchUiContext'
 import DesktopIcon from '@/shared/ui/icon/DesktopIcon.vue'
+import { DESKTOP_WORKBENCH_WIDTH_LIMITS } from '../../common/workbenchPanelLayout'
 import { useWorkbenchPanelResize } from './useWorkbenchPanelResize'
 
 const props = withDefaults(defineProps<{
   language: BuddyLocale
   contextVisible?: boolean
+  contextOnLeft?: boolean
+  contextMaximized?: boolean
   sidebarCollapsible?: boolean
   sidebarResizable?: boolean
   workspaceMinimumWidth?: number
 }>(), {
   contextVisible: true,
+  contextOnLeft: false,
+  contextMaximized: false,
   sidebarCollapsible: false,
   sidebarResizable: false,
   workspaceMinimumWidth: 288,
 })
 const slots = defineSlots<{
   context?: () => unknown
-  default: () => unknown
+  workspace: () => unknown
   sidebar?: () => unknown
 }>()
 const sidebarCollapsed = defineModel<boolean>('sidebarCollapsed', { default: false })
 const sidebarWidthPreference = defineModel<number | null>('sidebarWidth', { default: null })
 const { t } = useBuddyI18n(() => props.language)
 const container = useTemplateRef<HTMLElement>('container')
-const context = useTemplateRef<HTMLElement>('context')
+const context = shallowRef<HTMLElement | null>(null)
+function setContextElement(element: Element | ComponentPublicInstance | null) {
+  context.value = element instanceof HTMLElement ? element : null
+}
 const sidebar = useTemplateRef<HTMLElement>('sidebar')
+const maximized = computed(() => props.contextVisible && props.contextMaximized)
+const regions = computed(() => props.contextOnLeft ? ['context', 'workspace'] as const : ['workspace', 'context'] as const)
 useWorkbenchAnchor('workbench.sidebar', () => sidebar.value)
 function sidebarVisible() {
   const collapsible = props.sidebarCollapsible
@@ -53,8 +64,9 @@ const {
 } = useWorkbenchPanelResize({
   container,
   context,
-  contextVisible: () => props.contextVisible,
-  workspaceMinimumWidth: () => props.workspaceMinimumWidth,
+  contextOnLeft: () => props.contextOnLeft,
+  contextVisible: () => props.contextVisible && !maximized.value,
+  workspaceMinimumWidth: () => maximized.value ? DESKTOP_WORKBENCH_WIDTH_LIMITS.context.minimum : props.workspaceMinimumWidth,
   onSidebarWidthCommit: (width) => {
     sidebarWidthPreference.value = width
   },
@@ -110,6 +122,8 @@ onBeforeUnmount(() => {
     :class="{
       'is-resizing': activePanel !== null,
       'is-sidebar-transitioning': sidebarTransitioning,
+      'is-context-on-left': contextOnLeft,
+      'is-context-maximized': maximized,
     }"
     :style="layoutStyle"
   >
@@ -161,27 +175,35 @@ onBeforeUnmount(() => {
     >
       <DesktopIcon class="desktop-workbench-layout__sidebar-chevron" name="sidebarChevron" />
     </button>
-    <main class="desktop-workbench-layout__workspace">
-      <slot />
-    </main>
-    <div
-      v-if="$slots.context && contextVisible"
-      class="desktop-workbench-layout__resizer"
-      :class="{ 'is-active': activePanel === 'context' }"
-      data-testid="workbench-context-resizer"
-      role="separator"
-      :aria-label="t('desktop.layout.resizeContext')"
-      aria-orientation="vertical"
-      :aria-valuemax="Math.round(contextRange.maximum)"
-      :aria-valuemin="Math.round(contextRange.minimum)"
-      :aria-valuenow="Math.round(contextWidth)"
-      tabindex="0"
-      @keydown="handleResizeKeydown('context', $event)"
-      @pointerdown="beginResize('context', $event)"
-    />
-    <aside v-if="$slots.context" v-show="contextVisible" ref="context" class="desktop-workbench-layout__context" :style="contextStyle" :inert="!contextVisible" :aria-hidden="!contextVisible">
-      <slot name="context" />
-    </aside>
+    <template v-for="(region, index) in regions" :key="region">
+      <main
+        v-if="region === 'workspace'" v-show="!maximized" class="desktop-workbench-layout__workspace"
+        :inert="maximized" :aria-hidden="maximized"
+      >
+        <slot name="workspace" />
+      </main>
+      <aside
+        v-else-if="$slots.context" v-show="contextVisible" :ref="setContextElement" class="desktop-workbench-layout__context"
+        :style="contextStyle" :inert="!contextVisible" :aria-hidden="!contextVisible"
+      >
+        <slot name="context" />
+      </aside>
+      <div
+        v-if="index === 0 && $slots.context && contextVisible && !maximized"
+        class="desktop-workbench-layout__resizer"
+        :class="{ 'is-active': activePanel === 'context' }"
+        data-testid="workbench-context-resizer"
+        role="separator"
+        :aria-label="t('desktop.layout.resizeContext')"
+        aria-orientation="vertical"
+        :aria-valuemax="Math.round(contextRange.maximum)"
+        :aria-valuemin="Math.round(contextRange.minimum)"
+        :aria-valuenow="Math.round(contextWidth)"
+        tabindex="0"
+        @keydown="handleResizeKeydown('context', $event)"
+        @pointerdown="beginResize('context', $event)"
+      />
+    </template>
     <div v-if="activePanel" class="desktop-workbench-layout__resize-shield" />
   </section>
 </template>
@@ -239,6 +261,16 @@ onBeforeUnmount(() => {
   border-left: 1px solid var(--buddy-border-subtle);
 }
 
+.desktop-workbench-layout.is-context-on-left > .desktop-workbench-layout__context {
+  border-right: 1px solid var(--buddy-border-subtle);
+  border-left: 0;
+}
+
+.desktop-workbench-layout.is-context-maximized > .desktop-workbench-layout__context {
+  flex: 1;
+  border: 0;
+}
+
 .desktop-workbench-layout__resizer {
   position: relative;
   z-index: 11;
diff --git a/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelPresentation.ts b/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelPresentation.ts
new file mode 100644
index 000000000..704a05218
--- /dev/null
+++ b/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelPresentation.ts
@@ -0,0 +1,48 @@
+import type { WorkbenchController } from '../../services/WorkbenchController'
+import { computed, onScopeDispose, shallowRef } from 'vue'
+
+export function useWorkbenchPanelPresentation(controller: WorkbenchController, mainActive: () => boolean) {
+  const preferredContextOnLeft = shallowRef(false)
+  const maximized = shallowRef(false)
+  const dragging = shallowRef(false)
+  const contextOnLeft = computed(() => mainActive() && preferredContextOnLeft.value)
+  const contextMaximized = computed(() => maximized.value && !dragging.value)
+  const mainVisible = computed(() => mainActive() && !contextMaximized.value)
+
+  function restore() {
+    maximized.value = false
+  }
+
+  onScopeDispose(controller.onDidChangeFocus(({ context }) => {
+    if (context.values['focus.area'] === 'main')
+      restore()
+  }).dispose)
+  onScopeDispose(controller.navigation.onDidChange(({ kind }) => {
+    if (kind === 'started')
+      restore()
+  }).dispose)
+
+  return {
+    contextOnLeft,
+    contextMaximized,
+    mainVisible,
+    restore,
+    swap() {
+      if (mainActive() && !contextMaximized.value)
+        preferredContextOnLeft.value = !preferredContextOnLeft.value
+    },
+    toggleMaximize() {
+      maximized.value = !maximized.value
+    },
+    beginDrag() {
+      dragging.value = true
+    },
+    endDrag(dropped: boolean) {
+      if (dropped)
+        restore()
+      dragging.value = false
+    },
+  }
+}
+
+export type WorkbenchPanelPresentation = ReturnType<typeof useWorkbenchPanelPresentation>
diff --git a/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelResize.ts b/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelResize.ts
index 9532ea3b0..9b91e0e0b 100644
--- a/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelResize.ts
+++ b/apps/buddy/src/workbench/browser/layout/useWorkbenchPanelResize.ts
@@ -20,6 +20,7 @@ interface UseDesktopWorkbenchResizeOptions {
   workspaceMinimumWidth?: () => number
   container: Readonly<Ref<HTMLElement | null>>
   context: Readonly<Ref<HTMLElement | null>>
+  contextOnLeft?: () => boolean
   contextVisible?: () => boolean
   sidebar: Readonly<Ref<HTMLElement | null>>
   sidebarResizable: () => boolean
@@ -114,10 +115,12 @@ export function useWorkbenchPanelResize(options: UseDesktopWorkbenchResizeOption
     const bounds = resizeBounds
     if (!bounds)
       return
-    setPanelWidth(
-      panel,
-      panel === 'sidebar' ? clientX - bounds.left : bounds.right - clientX,
-    )
+    const width = panel === 'sidebar'
+      ? clientX - bounds.left
+      : options.contextOnLeft?.()
+        ? clientX - bounds.left - widths.value.sidebarWidth
+        : bounds.right - clientX
+    setPanelWidth(panel, width)
   }
 
   function flushResize(): void {
@@ -198,6 +201,7 @@ export function useWorkbenchPanelResize(options: UseDesktopWorkbenchResizeOption
       ? widths.value.sidebarWidth
       : widths.value.contextWidth
     const step = event.shiftKey ? KEYBOARD_RESIZE_LARGE_STEP : KEYBOARD_RESIZE_STEP
+    const growsLeft = panel === 'context' && !options.contextOnLeft?.()
     let nextWidth: number | null = null
 
     if (event.key === 'Home')
@@ -205,9 +209,9 @@ export function useWorkbenchPanelResize(options: UseDesktopWorkbenchResizeOption
     else if (event.key === 'End')
       nextWidth = range.maximum
     else if (event.key === 'ArrowLeft')
-      nextWidth = currentWidth + (panel === 'context' ? step : -step)
+      nextWidth = currentWidth + (growsLeft ? step : -step)
     else if (event.key === 'ArrowRight')
-      nextWidth = currentWidth + (panel === 'context' ? -step : step)
+      nextWidth = currentWidth + (growsLeft ? -step : step)
 
     if (nextWidth === null)
       return
diff --git a/apps/buddy/src/workbench/browser/workbenchContext.ts b/apps/buddy/src/workbench/browser/workbenchContext.ts
index bedcdae93..c7cbf30c5 100644
--- a/apps/buddy/src/workbench/browser/workbenchContext.ts
+++ b/apps/buddy/src/workbench/browser/workbenchContext.ts
@@ -4,10 +4,12 @@ import type { DropPosition, WorkbenchLayout } from '../common/workbench'
 import type { workbenchLabels } from '../common/workbenchLabels'
 import type { WorkbenchController } from '../services/WorkbenchController'
 import type { WorkingCopyService } from '../services/WorkingCopyService'
+import type { WorkbenchPanelPresentation } from './layout/useWorkbenchPanelPresentation'
 import type { WorkbenchResize } from './useWorkbenchResize'
 import { inject } from 'vue'
 
 export interface WorkbenchContext {
+  panels: WorkbenchPanelPresentation
   resize: WorkbenchResize
   controller: WorkbenchController
   copies: WorkingCopyService
diff --git a/apps/buddy/src/workbench/common/__tests__/workbenchPanelLayout.spec.ts b/apps/buddy/src/workbench/common/__tests__/workbenchPanelLayout.spec.ts
index 54c51dbe3..a2b10bf01 100644
--- a/apps/buddy/src/workbench/common/__tests__/workbenchPanelLayout.spec.ts
+++ b/apps/buddy/src/workbench/common/__tests__/workbenchPanelLayout.spec.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { resolveDesktopWorkbenchWidths } from '../workbenchPanelLayout'
+import { resolveDesktopWorkbenchPanelRange, resolveDesktopWorkbenchWidths } from '../workbenchPanelLayout'
 
 describe('nested workbench width allocation', () => {
   it('keeps a hidden sidebar at zero when the outer layout cannot meet its workspace minimum', () => {
@@ -12,4 +12,32 @@ describe('nested workbench width allocation', () => {
       workspaceMinimumWidth: 480,
     })).toEqual({ contextWidth: 272, sidebarWidth: 0, workspaceWidth: 348 })
   })
+
+  it('reserves the chat and resource minimum widths before shrinking history', () => {
+    expect(resolveDesktopWorkbenchWidths({
+      containerWidth: 760,
+      contextVisible: true,
+      preferredContextWidth: 400,
+      preferredSidebarWidth: 320,
+      sidebarVisible: true,
+    })).toEqual({ contextWidth: 272, sidebarWidth: 200, workspaceWidth: 288 })
+    expect(resolveDesktopWorkbenchPanelRange('context', {
+      containerWidth: 1200,
+      contextVisible: true,
+      contextWidth: 400,
+      sidebarWidth: 224,
+      sidebarVisible: true,
+    })).toEqual({ minimum: 272, maximum: 688 })
+  })
+
+  it('keeps history width and releases the context allocation while resources are maximized', () => {
+    expect(resolveDesktopWorkbenchWidths({
+      containerWidth: 760,
+      contextVisible: false,
+      preferredContextWidth: 400,
+      preferredSidebarWidth: 320,
+      sidebarVisible: true,
+      workspaceMinimumWidth: 272,
+    })).toEqual({ contextWidth: 0, sidebarWidth: 320, workspaceWidth: 440 })
+  })
 })