diff --git a/playwright/diagnostics.spec.ts b/playwright/diagnostics.spec.ts
index f8ec32c..3d30005 100644
--- a/playwright/diagnostics.spec.ts
+++ b/playwright/diagnostics.spec.ts
@@ -247,6 +247,42 @@ test('typecheck does not report TS2307 for stylesheet side-effect imports', asyn
   expect(diagnosticsText).not.toContain("Cannot find module '../styles/app.css'")
 })
 
+test('typecheck recognizes css module class maps in React mode', async ({ page }) => {
+  await waitForInitialRender(page)
+
+  await ensurePanelToolsVisible(page, 'component')
+  await addWorkspaceTab(page, { type: 'style' })
+  await page.getByRole('button', { name: 'Rename tab module.css' }).click()
+  const renameInput = page.getByLabel('Rename module.css')
+  await renameInput.fill('app.module.css')
+  await renameInput.press('Enter')
+
+  await setWorkspaceTabSource(page, {
+    fileName: 'app.module.css',
+    kind: 'styles',
+    source: ['.btn {', '  color: #fff;', '}'].join('\n'),
+  })
+
+  await setComponentEditorSource(
+    page,
+    [
+      "import styles from '../styles/app.module.css'",
+      '',
+      'const App = () => <button className={styles.btn}>ok</button>',
+      '',
+    ].join('\n'),
+  )
+
+  await runTypecheck(page)
+  await ensureDiagnosticsDrawerOpen(page)
+  await expect(page.locator('#diagnostics-component')).toContainText(
+    'No TypeScript errors found.',
+  )
+
+  const diagnosticsText = await page.locator('#diagnostics-component').innerText()
+  expect(diagnosticsText).not.toContain("Property 'btn' does not exist on type 'string'")
+})
+
 test('component diagnostics rows navigate editor to reported line', async ({ page }) => {
   await waitForInitialRender(page)
 
diff --git a/playwright/github-byot-ai.spec.ts b/playwright/github-byot-ai.spec.ts
index 8d3c559..7c2a65d 100644
--- a/playwright/github-byot-ai.spec.ts
+++ b/playwright/github-byot-ai.spec.ts
@@ -4,6 +4,7 @@ import type { ChatRequestBody, ChatRequestMessage } from './helpers/app-test-hel
 import {
   appEntryPath,
   connectByotWithSingleRepo,
+  ensureWorkspacesDrawerClosed,
   ensureAiChatDrawerOpen,
   ensureOpenPrDrawerOpen,
   mockRepositoryBranches,
@@ -12,6 +13,10 @@ import {
   setStylesEditorSource,
   waitForAppReady,
 } from './helpers/app-test-helpers.js'
+import {
+  getAllWorkspaceRecords,
+  seedLocalWorkspaceContexts,
+} from './github-pr-drawer/github-pr-drawer.helpers.js'
 
 test('PR/BYOT controls are visible and chat stays hidden until token connect', async ({
   page,
@@ -37,7 +42,256 @@ test('PR/BYOT controls are visible and chat stays hidden until token connect', a
   await expect(prToggle).toHaveCount(1)
   await expect(prToggle).toBeHidden()
   await expect(workspacesToggle).toHaveCount(1)
-  await expect(workspacesToggle).toBeHidden()
+  await expect(workspacesToggle).toBeVisible()
+})
+
+test('Workspaces repository filter is local-only and read-only without PAT', async ({
+  page,
+}) => {
+  await waitForAppReady(page)
+
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+  })
+  await expect(workspacesToggle).toBeVisible()
+
+  await workspacesToggle.click()
+
+  const repositoryFilter = page.getByRole('combobox', {
+    name: 'Workspace repository filter',
+  })
+  await expect(repositoryFilter).toBeDisabled()
+  await expect(repositoryFilter).toHaveValue('__local__')
+  await expect(repositoryFilter.locator('option')).toHaveCount(1)
+  await expect(repositoryFilter.locator('option')).toHaveText(['Local'])
+})
+
+test('No-PAT startup restores Local workspace from mixed stored contexts', async ({
+  page,
+}) => {
+  const localWorkspaceId = 'local_no_pat_restore_target'
+  const localHead = 'feat/local-no-pat-restore'
+  const localMarker = 'Local restore marker content'
+  const repositoryMarker = 'Repository restore marker content'
+
+  await waitForAppReady(page)
+
+  await page.evaluate(async () => {
+    const request = indexedDB.open('knighted-develop-workspaces')
+    const db = await new Promise<IDBDatabase>((resolve, reject) => {
+      request.onsuccess = () => resolve(request.result)
+      request.onerror = () => reject(request.error)
+      request.onblocked = () => reject(new Error('Could not open IndexedDB.'))
+    })
+
+    try {
+      const tx = db.transaction('prWorkspaces', 'readwrite')
+      const store = tx.objectStore('prWorkspaces')
+      const clearRequest = store.clear()
+
+      await new Promise<void>((resolve, reject) => {
+        clearRequest.onsuccess = () => resolve()
+        clearRequest.onerror = () => reject(clearRequest.error)
+      })
+
+      await new Promise<void>((resolve, reject) => {
+        tx.oncomplete = () => resolve()
+        tx.onerror = () => reject(tx.error)
+        tx.onabort = () => reject(tx.error)
+      })
+    } finally {
+      db.close()
+    }
+  })
+
+  await seedLocalWorkspaceContexts(page, [
+    {
+      id: localWorkspaceId,
+      repo: '',
+      workspaceScope: 'local',
+      base: 'main',
+      head: localHead,
+      prTitle: 'Local restore target',
+      prContextState: 'inactive',
+      prNumber: null,
+      tabs: [
+        {
+          id: 'entry',
+          name: 'App.tsx',
+          path: 'src/components/App.tsx',
+          language: 'javascript-jsx',
+          role: 'entry',
+          isActive: true,
+          content: `export const App = () => <main>${localMarker}</main>`,
+        },
+      ],
+      activeTabId: 'entry',
+      createdAt: Date.now() - 5000,
+      lastModified: Date.now() - 5000,
+    },
+    {
+      id: 'repo_no_pat_restore_should_not_apply',
+      repo: 'knightedcodemonkey/develop',
+      workspaceScope: 'repository',
+      base: 'main',
+      head: 'feat/repo-should-not-restore-without-pat',
+      prTitle: 'Repository active context',
+      prContextState: 'active',
+      prNumber: 107,
+      tabs: [
+        {
+          id: 'entry',
+          name: 'App.tsx',
+          path: 'src/components/App.tsx',
+          language: 'javascript-jsx',
+          role: 'entry',
+          isActive: true,
+          content: `export const App = () => <main>${repositoryMarker}</main>`,
+        },
+      ],
+      activeTabId: 'entry',
+      createdAt: Date.now() + 5000,
+      lastModified: Date.now() + 5000,
+    },
+  ])
+
+  await page.reload()
+  await waitForAppReady(page)
+
+  await expect(page.locator('#github-pr-head-branch')).toHaveValue(localHead)
+  await expect(
+    page.getByRole('textbox', { name: 'Component source editor' }),
+  ).toContainText(localMarker)
+  await expect(
+    page.getByRole('textbox', { name: 'Component source editor' }),
+  ).not.toContainText(repositoryMarker)
+
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+  })
+  await workspacesToggle.click()
+
+  await expect(page.locator('#workspaces-repository')).toBeDisabled()
+  await expect(page.locator('#workspaces-select')).toHaveValue(localWorkspaceId)
+  await expect(page.getByRole('button', { name: 'Remove', exact: true })).toBeDisabled()
+})
+
+test('PAT connect after Local-only session preserves Local records and enables repository workflows', async ({
+  page,
+}) => {
+  const localWorkspaceId = 'local_pat_connect_preserve'
+  const localHead = 'feat/local-before-pat-connect'
+
+  await waitForAppReady(page)
+
+  await page.evaluate(async () => {
+    const request = indexedDB.open('knighted-develop-workspaces')
+    const db = await new Promise<IDBDatabase>((resolve, reject) => {
+      request.onsuccess = () => resolve(request.result)
+      request.onerror = () => reject(request.error)
+      request.onblocked = () => reject(new Error('Could not open IndexedDB.'))
+    })
+
+    try {
+      const tx = db.transaction('prWorkspaces', 'readwrite')
+      const store = tx.objectStore('prWorkspaces')
+      const clearRequest = store.clear()
+
+      await new Promise<void>((resolve, reject) => {
+        clearRequest.onsuccess = () => resolve()
+        clearRequest.onerror = () => reject(clearRequest.error)
+      })
+
+      await new Promise<void>((resolve, reject) => {
+        tx.oncomplete = () => resolve()
+        tx.onerror = () => reject(tx.error)
+        tx.onabort = () => reject(tx.error)
+      })
+    } finally {
+      db.close()
+    }
+  })
+
+  await seedLocalWorkspaceContexts(page, [
+    {
+      id: localWorkspaceId,
+      repo: '',
+      workspaceScope: 'local',
+      base: 'main',
+      head: localHead,
+      prTitle: 'Local only workspace before PAT',
+      prContextState: 'inactive',
+      prNumber: null,
+      createdAt: Date.now() - 1000,
+      lastModified: Date.now() - 1000,
+    },
+  ])
+
+  await page.reload()
+  await waitForAppReady(page)
+
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+  })
+  await workspacesToggle.click()
+
+  const repositoryFilter = page.getByLabel('Workspace repository filter')
+  await expect(repositoryFilter).toBeDisabled()
+  await expect(repositoryFilter).toHaveValue('__local__')
+  await expect(page.locator('#workspaces-select')).toHaveValue(localWorkspaceId)
+
+  await ensureWorkspacesDrawerClosed(page)
+
+  await page.route('https://api.github.com/user/repos**', async route => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify([
+        {
+          id: 11,
+          owner: { login: 'knightedcodemonkey' },
+          name: 'develop',
+          full_name: 'knightedcodemonkey/develop',
+          default_branch: 'main',
+          permissions: { push: true },
+        },
+      ]),
+    })
+  })
+
+  await mockRepositoryBranches(page, {
+    'knightedcodemonkey/develop': ['main', 'release'],
+  })
+
+  await page
+    .getByRole('textbox', { name: 'GitHub token' })
+    .fill('github_pat_fake_transition_1234567890')
+  await page.getByRole('button', { name: 'Add GitHub token' }).click()
+
+  await expect(page.getByRole('button', { name: 'Open pull request' })).toBeVisible()
+
+  await workspacesToggle.click()
+  await expect(repositoryFilter).toBeEnabled()
+  await expect(repositoryFilter.locator('option')).toHaveCount(2)
+  await expect(repositoryFilter.locator('option')).toHaveText([
+    'Local',
+    'knightedcodemonkey/develop',
+  ])
+
+  await repositoryFilter.selectOption('knightedcodemonkey/develop')
+  await expect(repositoryFilter).toHaveValue('knightedcodemonkey/develop')
+
+  const records = await getAllWorkspaceRecords(page)
+  const localRecord = records.find(record => record?.id === localWorkspaceId)
+
+  expect(localRecord).toBeTruthy()
+  expect(typeof localRecord?.repo === 'string' ? localRecord.repo : '').toBe('')
+  expect(
+    typeof localRecord?.workspaceScope === 'string' ? localRecord.workspaceScope : '',
+  ).toBe('local')
 })
 
 test('chat becomes available after token connect', async ({ page }) => {
@@ -80,7 +334,7 @@ test('BYOT controls render with default app entry', async ({ page }) => {
   await expect(prToggle).toHaveCount(1)
   await expect(prToggle).toBeHidden()
   await expect(workspacesToggle).toHaveCount(1)
-  await expect(workspacesToggle).toBeHidden()
+  await expect(workspacesToggle).toBeVisible()
 })
 
 test('GitHub token info panel reflects missing and present token states', async ({
@@ -141,9 +395,21 @@ test('deleting saved GitHub token requires confirmation modal', async ({ page })
   const tokenDelete = page.getByRole('button', { name: 'Delete GitHub token' })
   const tokenAdd = page.getByRole('button', { name: 'Add GitHub token' })
   const tokenInput = page.getByRole('textbox', { name: 'GitHub token' })
+  const workspacesToggle = page.getByRole('button', {
+    name: 'Workspaces',
+    exact: true,
+  })
+  const repositoryFilter = page.getByRole('combobox', {
+    name: 'Workspace repository filter',
+  })
 
   await expect(tokenDelete).toBeVisible()
 
+  await workspacesToggle.click()
+  await expect(repositoryFilter).toBeEnabled()
+  await repositoryFilter.selectOption('knightedcodemonkey/develop')
+  await expect(repositoryFilter).toHaveValue('knightedcodemonkey/develop')
+
   await tokenDelete.click()
   await expect(dialog).toHaveAttribute('open', '')
   await expect(page.getByText('Remove saved GitHub token?', { exact: true })).toHaveText(
@@ -176,6 +442,12 @@ test('deleting saved GitHub token requires confirmation modal', async ({ page })
   await expect(tokenAdd).toBeVisible()
   await expect(tokenDelete).toBeHidden()
   await expect(tokenInput).toHaveValue('')
+  await expect(workspacesToggle).toHaveAttribute('aria-expanded', 'false')
+  await expect(page.getByRole('complementary', { name: 'Workspaces' })).toBeHidden()
+
+  await workspacesToggle.click()
+  await expect(repositoryFilter).toBeDisabled()
+  await expect(repositoryFilter).toHaveValue('__local__')
 })
 
 test('AI chat drawer opens and closes', async ({ page }) => {
diff --git a/playwright/rendering-modes/core.spec.ts b/playwright/rendering-modes/core.spec.ts
index 717e085..b4f3489 100644
--- a/playwright/rendering-modes/core.spec.ts
+++ b/playwright/rendering-modes/core.spec.ts
@@ -217,6 +217,14 @@ test('css module imports expose class map for module tabs', async ({ page }) =>
       '.item {',
       '  color: rgb(10, 20, 30);',
       '}',
+      '',
+      '.item:hover {',
+      '  color: rgb(30, 40, 50);',
+      '}',
+      '',
+      '.item:active {',
+      '  color: rgb(60, 70, 80);',
+      '}',
     ].join('\n'),
   })
 
@@ -283,6 +291,19 @@ test('css module imports expose class map for module tabs', async ({ page }) =>
     'color',
     'rgb(10, 20, 30)',
   )
+
+  await expect
+    .poll(async () => readPreviewUserStyleText(page))
+    .toEqual(expect.stringMatching(/\.[A-Za-z0-9_-]+_item:hover\s*\{/))
+  await expect
+    .poll(async () => readPreviewUserStyleText(page))
+    .toEqual(expect.stringMatching(/\.[A-Za-z0-9_-]+_item:active\s*\{/))
+  await expect
+    .poll(async () => readPreviewUserStyleText(page))
+    .not.toContain('.item:hover')
+  await expect
+    .poll(async () => readPreviewUserStyleText(page))
+    .not.toContain('.item:active')
 })
 
 test('preview styles require explicit import from entry graph', async ({ page }) => {
@@ -562,16 +583,15 @@ test('config patch keeps preview style order stable around app head styles', asy
       }
     })
 
-  if (!resolvedOrderBeforePatch) {
-    throw new Error('Expected app-injected head style to exist before config patch.')
+  expect(resolvedOrderBeforePatch).not.toBeNull()
+  const orderBeforePatch = resolvedOrderBeforePatch as {
+    baseIndex: number
+    userIndex: number
+    appIndex: number
   }
 
-  expect(resolvedOrderBeforePatch.baseIndex).toBeLessThan(
-    resolvedOrderBeforePatch.userIndex,
-  )
-  expect(resolvedOrderBeforePatch.userIndex).toBeLessThan(
-    resolvedOrderBeforePatch.appIndex,
-  )
+  expect(orderBeforePatch.baseIndex).toBeLessThan(orderBeforePatch.userIndex)
+  expect(orderBeforePatch.userIndex).toBeLessThan(orderBeforePatch.appIndex)
 
   await page.getByLabel('Background').fill('#456789')
 
@@ -600,7 +620,7 @@ test('config patch keeps preview style order stable around app head styles', asy
           }
         })
     })
-    .toEqual(resolvedOrderBeforePatch)
+    .toEqual(orderBeforePatch)
 })
 
 test('nested module imports can bring styles into preview graph', async ({ page }) => {
diff --git a/src/app.js b/src/app.js
index 3fd1a38..fb1155d 100644
--- a/src/app.js
+++ b/src/app.js
@@ -490,7 +490,6 @@ const prContextUi = createGitHubPrContextUiController({
   stylesPrSyncIconPath,
   githubPrContextClose,
   aiChatToggle,
-  workspacesToggle,
   githubPrOpenIcon,
   githubPrPushCommitIcon,
   closeChatDrawer: () => {
@@ -499,7 +498,9 @@ const prContextUi = createGitHubPrContextUiController({
   closePrDrawer: () => {
     prDrawerController.setOpen(false)
   },
-  closeWorkspacesDrawer: () => workspacesDrawerController?.setOpen(false),
+  closeWorkspacesDrawer: () => {
+    void workspacesDrawerController?.setOpen(false)
+  },
 })
 
 const editedIndicatorVisibilityController = createEditedIndicatorVisibilityController({
@@ -583,6 +584,8 @@ githubAiContextState.token = byotControls.getToken()
 githubAiContextState.writableRepositories = byotControls.getWritableRepositories()
 
 const getCurrentGitHubToken = () => githubAiContextState.token ?? byotControls.getToken()
+const hasCurrentGitHubToken = () =>
+  typeof getCurrentGitHubToken() === 'string' && getCurrentGitHubToken().trim().length > 0
 
 const getCurrentSelectedRepository = () =>
   githubAiContextState.selectedRepository ?? byotControls.getSelectedRepository()
@@ -799,6 +802,7 @@ const {
 } = createWorkspaceControllersSetup({
   createDebouncedWorkspaceSaver,
   workspaceStorage,
+  getHasGitHubToken: () => hasCurrentGitHubToken(),
   getWorkspacesDrawerController: () => workspacesDrawerController,
   toNonEmptyWorkspaceText,
   buildWorkspaceRecordSnapshot,
diff --git a/src/index.html b/src/index.html
index 3f95a62..2119a49 100644
--- a/src/index.html
+++ b/src/index.html
@@ -139,24 +139,6 @@ <h1>
             </button>
           </div>
 
-          <button
-            class="diagnostics-toggle workspaces-toggle"
-            id="workspaces-toggle"
-            type="button"
-            aria-expanded="false"
-            aria-controls="workspaces-drawer"
-            title="Manage local workspaces"
-            disabled
-            hidden
-          >
-            <svg class="workspaces-toggle__icon" viewBox="0 0 24 24" aria-hidden="true">
-              <path
-                d="M12 1.25c2.487 0 4.773.402 6.466 1.079.844.337 1.577.758 2.112 1.264.536.507.922 1.151.922 1.907v12.987l-.026.013h.026c0 .756-.386 1.4-.922 1.907-.535.506-1.268.927-2.112 1.264-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079c-.844-.337-1.577-.758-2.112-1.264C2.886 19.9 2.5 19.256 2.5 18.5h.026l-.026-.013V5.5c0-.756.386-1.4.922-1.907.535-.506 1.268-.927 2.112-1.264C7.226 1.652 9.513 1.25 12 1.25ZM4 14.371v4.116l-.013.013H4c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817h.013L20 18.487v-4.116a7.85 7.85 0 0 1-1.534.8c-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079a7.843 7.843 0 0 1-1.534-.8ZM20 12V7.871a7.85 7.85 0 0 1-1.534.8C16.773 9.348 14.487 9.75 12 9.75s-4.774-.402-6.466-1.079A7.85 7.85 0 0 1 4 7.871V12c0 .21.104.487.453.817.35.332.899.666 1.638.961 1.475.59 3.564.972 5.909.972 2.345 0 4.434-.382 5.909-.972.74-.295 1.287-.629 1.638-.96.35-.33.453-.607.453-.818ZM4 5.5c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817 0-.211-.103-.487-.453-.817-.351-.332-.898-.666-1.638-.962-1.475-.589-3.564-.971-5.909-.971-2.345 0-4.434.381-5.909.971-.739.296-1.288.63-1.638.962C4.104 5.013 4 5.29 4 5.5Z"
-              ></path>
-            </svg>
-            <span>Workspaces</span>
-          </button>
-
           <button
             class="diagnostics-toggle github-pr-toggle"
             id="github-pr-toggle"
@@ -222,19 +204,41 @@ <h1>
 
         <div class="app-grid-layout-top-controls" role="group" aria-label="Rail controls">
           <div
-            class="app-grid-diagnostics-controls"
+            class="app-grid-workspaces-diagnostics-controls"
             role="group"
-            aria-label="Diagnostics"
+            aria-label="Workspaces and diagnostics"
           >
             <button
-              class="diagnostics-toggle"
-              id="diagnostics-toggle"
+              class="diagnostics-toggle workspaces-toggle"
+              id="workspaces-toggle"
               type="button"
               aria-expanded="false"
-              aria-controls="diagnostics-drawer"
+              aria-controls="workspaces-drawer"
+              title="Manage workspaces"
             >
-              Diagnostics
+              <svg class="workspaces-toggle__icon" viewBox="0 0 24 24" aria-hidden="true">
+                <path
+                  d="M12 1.25c2.487 0 4.773.402 6.466 1.079.844.337 1.577.758 2.112 1.264.536.507.922 1.151.922 1.907v12.987l-.026.013h.026c0 .756-.386 1.4-.922 1.907-.535.506-1.268.927-2.112 1.264-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079c-.844-.337-1.577-.758-2.112-1.264C2.886 19.9 2.5 19.256 2.5 18.5h.026l-.026-.013V5.5c0-.756.386-1.4.922-1.907.535-.506 1.268-.927 2.112-1.264C7.226 1.652 9.513 1.25 12 1.25ZM4 14.371v4.116l-.013.013H4c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817h.013L20 18.487v-4.116a7.85 7.85 0 0 1-1.534.8c-1.693.677-3.979 1.079-6.466 1.079s-4.774-.402-6.466-1.079a7.843 7.843 0 0 1-1.534-.8ZM20 12V7.871a7.85 7.85 0 0 1-1.534.8C16.773 9.348 14.487 9.75 12 9.75s-4.774-.402-6.466-1.079A7.85 7.85 0 0 1 4 7.871V12c0 .21.104.487.453.817.35.332.899.666 1.638.961 1.475.59 3.564.972 5.909.972 2.345 0 4.434-.382 5.909-.972.74-.295 1.287-.629 1.638-.96.35-.33.453-.607.453-.818ZM4 5.5c0 .211.103.487.453.817.351.332.898.666 1.638.962 1.475.589 3.564.971 5.909.971 2.345 0 4.434-.381 5.909-.971.739-.296 1.288-.63 1.638-.962.349-.33.453-.607.453-.817 0-.211-.103-.487-.453-.817-.351-.332-.898-.666-1.638-.962-1.475-.589-3.564-.971-5.909-.971-2.345 0-4.434.381-5.909.971-.739.296-1.288.63-1.638.962C4.104 5.013 4 5.29 4 5.5Z"
+                ></path>
+              </svg>
+              <span>Workspaces</span>
             </button>
+
+            <div
+              class="app-grid-diagnostics-controls"
+              role="group"
+              aria-label="Diagnostics"
+            >
+              <button
+                class="diagnostics-toggle"
+                id="diagnostics-toggle"
+                type="button"
+                aria-expanded="false"
+                aria-controls="diagnostics-drawer"
+              >
+                Diagnostics
+              </button>
+            </div>
           </div>
 
           <button
diff --git a/src/modules/app-core/github-pr-context-ui.js b/src/modules/app-core/github-pr-context-ui.js
index b48a197..fd5689e 100644
--- a/src/modules/app-core/github-pr-context-ui.js
+++ b/src/modules/app-core/github-pr-context-ui.js
@@ -11,7 +11,6 @@ export const createGitHubPrContextUiController = ({
   stylesPrSyncIconPath,
   githubPrContextClose,
   aiChatToggle,
-  workspacesToggle,
   githubPrOpenIcon,
   githubPrPushCommitIcon,
   closeChatDrawer,
@@ -104,10 +103,6 @@ export const createGitHubPrContextUiController = ({
     const hasToken = typeof token === 'string' && token.trim().length > 0
 
     if (hasToken) {
-      if (workspacesToggle instanceof HTMLButtonElement) {
-        workspacesToggle.disabled = false
-      }
-
       if (aiChatToggle instanceof HTMLElement) {
         aiChatToggle.hidden = false
       }
@@ -116,10 +111,6 @@ export const createGitHubPrContextUiController = ({
         githubPrToggle.hidden = false
       }
 
-      if (workspacesToggle instanceof HTMLElement) {
-        workspacesToggle.hidden = false
-      }
-
       if (contextState.activePrContext) {
         githubPrContextClose?.removeAttribute('hidden')
       } else {
@@ -132,9 +123,6 @@ export const createGitHubPrContextUiController = ({
       aiChatToggle.hidden = true
     }
     aiChatToggle?.setAttribute('aria-expanded', 'false')
-    if (workspacesToggle instanceof HTMLButtonElement) {
-      workspacesToggle.disabled = true
-    }
     contextState.activePrContext = null
     contextState.activePrEditorSyncKey = ''
     contextState.hasSyncedActivePrEditorContent = false
@@ -144,14 +132,10 @@ export const createGitHubPrContextUiController = ({
       githubPrToggle.hidden = true
     }
     githubPrToggle?.setAttribute('aria-expanded', 'false')
-    if (workspacesToggle instanceof HTMLElement) {
-      workspacesToggle.hidden = true
-    }
-    workspacesToggle?.setAttribute('aria-expanded', 'false')
     githubPrContextClose?.setAttribute('hidden', '')
     closeChatDrawer?.()
     closePrDrawer?.()
-    void closeWorkspacesDrawer?.()
+    closeWorkspacesDrawer?.()
   }
 
   return {
diff --git a/src/modules/app-core/workspace-context-controller.js b/src/modules/app-core/workspace-context-controller.js
index 9c9bd27..c5419af 100644
--- a/src/modules/app-core/workspace-context-controller.js
+++ b/src/modules/app-core/workspace-context-controller.js
@@ -1,5 +1,6 @@
 const createWorkspaceContextController = ({
   workspaceStorage,
+  getHasGitHubToken,
   getCurrentSelectedRepository,
   getWorkspacesDrawerController,
   getActiveWorkspaceRecordId,
@@ -34,6 +35,14 @@ const createWorkspaceContextController = ({
   const toWorkspacePrContextState = value =>
     typeof value === 'string' ? value.trim().toLowerCase() : ''
 
+  const shouldUseLocalOnlyRestoreCandidates = () => {
+    if (typeof getHasGitHubToken !== 'function') {
+      return false
+    }
+
+    return getHasGitHubToken() !== true
+  }
+
   const listLocalContextRecords = async ({ includeAllRepositories = true } = {}) => {
     if (includeAllRepositories) {
       return workspaceStorage.listWorkspaces()
@@ -177,6 +186,29 @@ const createWorkspaceContextController = ({
       return
     }
 
+    if (shouldUseLocalOnlyRestoreCandidates()) {
+      options = options.filter(workspace => {
+        const scope =
+          typeof workspace?.workspaceScope === 'string'
+            ? workspace.workspaceScope.trim().toLowerCase()
+            : ''
+
+        if (scope === 'local') {
+          return true
+        }
+
+        if (scope === 'repository') {
+          return false
+        }
+
+        return !(typeof workspace?.repo === 'string' && workspace.repo.trim().length > 0)
+      })
+
+      if (options.length === 0) {
+        return
+      }
+    }
+
     const activeWorkspaceRecordId = getActiveWorkspaceRecordId()
     const preferredById = activeWorkspaceRecordId
       ? options.find(workspace => workspace.id === activeWorkspaceRecordId)
diff --git a/src/modules/app-core/workspace-controllers-setup.js b/src/modules/app-core/workspace-controllers-setup.js
index 77298e9..c5ebb5a 100644
--- a/src/modules/app-core/workspace-controllers-setup.js
+++ b/src/modules/app-core/workspace-controllers-setup.js
@@ -7,6 +7,7 @@ import { createWorkspaceTabsRenderer } from './workspace-tabs-renderer.js'
 const createWorkspaceControllersSetup = ({
   createDebouncedWorkspaceSaver,
   workspaceStorage,
+  getHasGitHubToken,
   getWorkspacesDrawerController,
   toNonEmptyWorkspaceText,
   buildWorkspaceRecordSnapshot,
@@ -203,6 +204,7 @@ const createWorkspaceControllersSetup = ({
 
   const workspaceContextController = createWorkspaceContextController({
     workspaceStorage,
+    getHasGitHubToken,
     getCurrentSelectedRepository,
     getWorkspacesDrawerController,
     getActiveWorkspaceRecordId,
diff --git a/src/modules/diagnostics/type-diagnostics.js b/src/modules/diagnostics/type-diagnostics.js
index cec924a..af207e4 100644
--- a/src/modules/diagnostics/type-diagnostics.js
+++ b/src/modules/diagnostics/type-diagnostics.js
@@ -50,6 +50,10 @@ const domJsxTypes =
   '}\n'
 
 const styleImportTypes =
+  "declare module '*.module.css' {\n" +
+  '  const classNames: Record<string, string>\n' +
+  '  export default classNames\n' +
+  '}\n' +
   "declare module '*.css' {\n" +
   '  const cssText: string\n' +
   '  export default cssText\n' +
diff --git a/src/modules/preview/render-runtime.js b/src/modules/preview/render-runtime.js
index 0672bae..da18f79 100644
--- a/src/modules/preview/render-runtime.js
+++ b/src/modules/preview/render-runtime.js
@@ -221,36 +221,6 @@ export const createRenderRuntimeController = ({
     return typeof value === 'string' ? value : ''
   }
 
-  const escapeRegex = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-
-  const appendCssModuleLocalAliases = (cssText, moduleExports) => {
-    if (!cssText || !moduleExports) {
-      return cssText
-    }
-
-    let output = cssText
-
-    for (const [localClassName, exportedValue] of Object.entries(moduleExports)) {
-      if (typeof localClassName !== 'string' || !localClassName) {
-        continue
-      }
-
-      const hashedTokens = normalizeCssModuleExport(exportedValue)
-        .split(/\s+/)
-        .filter(Boolean)
-
-      for (const hashedClassName of hashedTokens) {
-        if (hashedClassName === localClassName) {
-          continue
-        }
-        const rx = new RegExp(`\\.${escapeRegex(hashedClassName)}(?![\\w-])`, 'g')
-        output = output.replace(rx, `.${hashedClassName}, .${localClassName}`)
-      }
-    }
-
-    return output
-  }
-
   const formatTransformDiagnosticsError = diagnostics => {
     const firstDiagnostic = diagnostics?.[0]
 
@@ -549,10 +519,7 @@ export const createRenderRuntimeController = ({
 
           const moduleExports = result.exports ?? null
           return {
-            css:
-              input.dialect === 'module'
-                ? appendCssModuleLocalAliases(result.css, moduleExports)
-                : result.css,
+            css: result.css,
             moduleExports,
           }
         }),
diff --git a/src/modules/workspace/workspaces-drawer/drawer.js b/src/modules/workspace/workspaces-drawer/drawer.js
index 76695d8..339ef1a 100644
--- a/src/modules/workspace/workspaces-drawer/drawer.js
+++ b/src/modules/workspace/workspaces-drawer/drawer.js
@@ -272,6 +272,9 @@ export const createWorkspacesDrawer = ({
     const hasLocalOption = normalizedOptions.some(
       option => option.value === localRepositoryFilterValue,
     )
+    const hasWritableRepositoryOptions = normalizedOptions.some(
+      option => option.value !== localRepositoryFilterValue,
+    )
 
     const repositoryOptions = hasLocalOption
       ? normalizedOptions
@@ -285,6 +288,10 @@ export const createWorkspacesDrawer = ({
 
     const nextSelectedFilter = getNormalizedRepositoryFilter(requestedFilter)
 
+    if (!hasWritableRepositoryOptions) {
+      hasUserSelectedRepositoryFilter = false
+    }
+
     repositorySelect.replaceChildren(
       ...repositoryOptions.map(option => {
         const optionNode = document.createElement('option')
@@ -295,6 +302,14 @@ export const createWorkspacesDrawer = ({
       }),
     )
 
+    repositorySelect.disabled = !hasWritableRepositoryOptions
+
+    if (!hasWritableRepositoryOptions) {
+      selectedRepositoryFilter = localRepositoryFilterValue
+      repositorySelect.value = localRepositoryFilterValue
+      return
+    }
+
     if (repositoryOptions.some(option => option.value === nextSelectedFilter)) {
       selectedRepositoryFilter = nextSelectedFilter
       repositorySelect.value = nextSelectedFilter
diff --git a/src/styles/ai-controls.css b/src/styles/ai-controls.css
index 3deac13..f1691cc 100644
--- a/src/styles/ai-controls.css
+++ b/src/styles/ai-controls.css
@@ -16,7 +16,6 @@
   display: inline-flex;
   align-items: center;
   gap: 10px;
-  margin-right: 6px;
   padding-right: 12px;
   border-right: 1px solid var(--border-subtle);
 }
@@ -1050,6 +1049,24 @@
     flex-wrap: nowrap;
   }
 
+  .diagnostics-toggle.workspaces-toggle {
+    gap: 0;
+    margin-left: 0;
+    padding-inline: 10px;
+  }
+
+  .diagnostics-toggle.workspaces-toggle > span {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border: 0;
+  }
+
   .app-grid-ai-controls {
     position: absolute;
     top: calc(100% + 10px);
@@ -1117,6 +1134,17 @@
     max-height: min(72vh, calc(100dvh - 92px));
   }
 
+  .workspaces-drawer,
+  .workspaces-drawer.workspaces-drawer--right,
+  .workspaces-drawer.workspaces-drawer--left {
+    top: max(132px, calc(env(safe-area-inset-top) + 108px));
+    right: 24px;
+    left: 24px;
+    width: calc(100vw - 48px);
+    max-width: none;
+    max-height: min(72vh, calc(100dvh - 148px));
+  }
+
   .github-pr-drawer__form-grid {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
@@ -1137,3 +1165,12 @@
     align-items: flex-start;
   }
 }
+
+@media (width <= 640px) {
+  .workspaces-drawer,
+  .workspaces-drawer.workspaces-drawer--right,
+  .workspaces-drawer.workspaces-drawer--left {
+    top: max(210px, calc(env(safe-area-inset-top) + 186px));
+    max-height: min(68vh, calc(100dvh - 226px));
+  }
+}
diff --git a/src/styles/layout-shell.css b/src/styles/layout-shell.css
index bc62537..2b5a292 100644
--- a/src/styles/layout-shell.css
+++ b/src/styles/layout-shell.css
@@ -226,6 +226,14 @@
   gap: 10px;
 }
 
+.app-grid-workspaces-diagnostics-controls {
+  display: inline-flex;
+  align-items: center;
+  gap: 10px;
+  padding-right: 12px;
+  border-right: 1px solid var(--border-subtle);
+}
+
 .app-grid-ai-toggle {
   display: none;
 }
@@ -250,9 +258,6 @@
 .app-grid-diagnostics-controls {
   display: inline-flex;
   align-items: center;
-  margin-right: 8px;
-  padding-right: 10px;
-  border-right: 1px solid var(--border-subtle);
 }
 
 @media (width <= 1090px) {
@@ -272,8 +277,7 @@
     flex-wrap: nowrap;
   }
 
-  .app-grid-diagnostics-controls {
-    margin-right: 0;
+  .app-grid-workspaces-diagnostics-controls {
     padding-right: 0;
     border-right: none;
   }