fix: consistent head handling.

Author: knightedcodemonkey

playwright/github-pr-drawer.spec.ts

@@ -10,6 +10,7 @@ import {
   connectByotWithSingleRepo,
   ensureOpenPrDrawerOpen,
   mockRepositoryBranches,
+  resetWorkbenchStorage,
   setComponentEditorSource,
   setStylesEditorSource,
   waitForAppReady,
@@ -846,6 +847,214 @@ test('Open PR drawer can filter stored local contexts by search', async ({ page
   expect(labels).toEqual(['Select a stored local context', 'local:Beta local context'])
 })
 
+test('Blank-slate startup persists inactive local workspace before PAT', async ({
+  page,
+}) => {
+  await resetWorkbenchStorage(page)
+
+  await waitForAppReady(page, `${appEntryPath}`)
+
+  await expect
+    .poll(async () => {
+      const records = await getAllWorkspaceRecords(page)
+      if (!Array.isArray(records) || records.length === 0) {
+        return false
+      }
+
+      const latest = records.slice().sort((a, b) => {
+        const aLastModified =
+          typeof a?.lastModified === 'number' && Number.isFinite(a.lastModified)
+            ? a.lastModified
+            : 0
+        const bLastModified =
+          typeof b?.lastModified === 'number' && Number.isFinite(b.lastModified)
+            ? b.lastModified
+            : 0
+        return bLastModified - aLastModified
+      })[0]
+
+      return (
+        latest?.prContextState === 'inactive' &&
+        latest?.prNumber === null &&
+        typeof latest?.repo === 'string'
+      )
+    })
+    .toBe(true)
+})
+
+test('Fresh PAT bootstrap persists drawer head metadata to IDB', async ({ page }) => {
+  const repositoryFullName = 'knightedcodemonkey/contract-case'
+
+  await resetWorkbenchStorage(page)
+
+  await page.route('https://api.github.com/user/repos**', async route => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify([
+        {
+          id: 12,
+          owner: { login: 'knightedcodemonkey' },
+          name: 'contract-case',
+          full_name: repositoryFullName,
+          default_branch: 'main',
+          permissions: { push: true },
+        },
+      ]),
+    })
+  })
+
+  await mockRepositoryBranches(page, {
+    [repositoryFullName]: ['main', 'release'],
+  })
+
+  await waitForAppReady(page, `${appEntryPath}`)
+
+  await page
+    .getByRole('textbox', { name: 'GitHub token' })
+    .fill('github_pat_fake_chat_1234567890')
+  await page.getByRole('button', { name: 'Add GitHub token' }).click()
+
+  await ensureOpenPrDrawerOpen(page)
+
+  await expect
+    .poll(async () => {
+      const selectedRepository = await page
+        .getByLabel('Pull request repository')
+        .inputValue()
+      const drawerHead = await page.getByLabel('Head').inputValue()
+      const records = await getAllWorkspaceRecords(page)
+
+      const latestRecord = records
+        .filter(record => record?.repo === selectedRepository)
+        .sort((a, b) => {
+          const aLastModified =
+            typeof a?.lastModified === 'number' && Number.isFinite(a.lastModified)
+              ? a.lastModified
+              : 0
+          const bLastModified =
+            typeof b?.lastModified === 'number' && Number.isFinite(b.lastModified)
+              ? b.lastModified
+              : 0
+          return bLastModified - aLastModified
+        })[0]
+
+      return (
+        Boolean(selectedRepository) &&
+        Boolean(drawerHead) &&
+        Boolean(latestRecord) &&
+        latestRecord.repo === selectedRepository &&
+        latestRecord.head === drawerHead
+      )
+    })
+    .toBe(true)
+})
+
+for (const prContextState of ['inactive', 'disconnected', 'closed'] as const) {
+  test(`Head stays fixed across repository changes for ${prContextState} workspace context`, async ({
+    page,
+  }) => {
+    const sourceRepository = 'knightedcodemonkey/contract-case'
+    const targetRepository = 'knightedcodemonkey/develop-sandbox'
+    const workspaceHead = 'feat/component-j101'
+    const workspaceId = buildWorkspaceRecordId({
+      repositoryFullName: sourceRepository,
+      headBranch: workspaceHead,
+    })
+
+    await resetWorkbenchStorage(page)
+
+    await page.route('https://api.github.com/user/repos**', async route => {
+      await route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify([
+          {
+            id: 12,
+            owner: { login: 'knightedcodemonkey' },
+            name: 'contract-case',
+            full_name: sourceRepository,
+            default_branch: 'main',
+            permissions: { push: true },
+          },
+          {
+            id: 13,
+            owner: { login: 'knightedcodemonkey' },
+            name: 'develop-sandbox',
+            full_name: targetRepository,
+            default_branch: 'main',
+            permissions: { push: true },
+          },
+        ]),
+      })
+    })
+
+    await mockRepositoryBranches(page, {
+      [sourceRepository]: ['main', 'release', workspaceHead],
+      [targetRepository]: ['main', 'release'],
+    })
+
+    await waitForAppReady(page, `${appEntryPath}`)
+
+    await seedLocalWorkspaceContexts(page, [
+      {
+        id: workspaceId,
+        repo: sourceRepository,
+        base: 'main',
+        head: workspaceHead,
+        prTitle: '',
+        prNumber: null,
+        prContextState,
+        renderMode: 'dom',
+        tabs: [
+          {
+            id: 'component',
+            name: 'App.tsx',
+            path: 'src/components/App.tsx',
+            language: 'javascript-jsx',
+            role: 'entry',
+            isActive: true,
+            content: 'export const App = () => <main>Workspace context</main>',
+          },
+          {
+            id: 'styles',
+            name: 'app.css',
+            path: 'src/styles/app.css',
+            language: 'css',
+            role: 'module',
+            isActive: false,
+            content: 'main { color: #111; }',
+          },
+        ],
+        activeTabId: 'component',
+      },
+    ])
+
+    await page
+      .getByRole('textbox', { name: 'GitHub token' })
+      .fill('github_pat_fake_chat_1234567890')
+    await page.getByRole('button', { name: 'Add GitHub token' }).click()
+
+    await page.getByRole('button', { name: 'Workspaces' }).click()
+    await page.locator('#workspaces-select').selectOption(workspaceId)
+    await page.locator('#workspaces-open').click()
+
+    await ensureOpenPrDrawerOpen(page)
+    await expect(page.getByLabel('Pull request repository')).toHaveValue(sourceRepository)
+    await expect(page.getByLabel('Head')).toHaveValue(workspaceHead)
+
+    await page.getByLabel('Pull request repository').selectOption(targetRepository)
+
+    await expect(page.getByLabel('Head')).toHaveValue(workspaceHead)
+    await expect
+      .poll(async () => {
+        const record = await getWorkspaceTabsRecord(page, { headBranch: workspaceHead })
+        return record?.head === workspaceHead
+      })
+      .toBe(true)
+  })
+}
+
 test('Open PR keeps inactive workspace record when repository changes', async ({
   page,
 }) => {
@@ -1694,6 +1903,21 @@ test('Active PR context disconnect uses local-only confirmation flow', async ({
       ).length
     })
     .toBe(0)
+  await expect
+    .poll(async () => {
+      const records = await getAllWorkspaceRecords(page)
+      const localRecord = records.find(
+        record =>
+          typeof record?.id === 'string' &&
+          record.id.startsWith('local_') &&
+          record?.repo === 'knightedcodemonkey/develop' &&
+          record?.prContextState === 'inactive',
+      )
+
+      const localHead = typeof localRecord?.head === 'string' ? localRecord.head : ''
+      return /^feat\/component-[a-z0-9]{4}$/.test(localHead)
+    })
+    .toBe(true)
   expect(closePullRequestRequestCount).toBe(0)
 
   await waitForAppReady(page, `${appEntryPath}`)
@@ -2146,6 +2370,9 @@ test('Active PR context rehydrates after token remove and re-add', async ({ page
   await expect(
     page.getByRole('button', { name: 'Push commit to active pull request branch' }),
   ).toBeVisible()
+  await expect
+    .poll(async () => page.getByRole('textbox', { name: 'Head' }).inputValue())
+    .toBe(githubHeadBranch)
 
   await expect
     .poll(async () => {

src/app.js

@@ -1426,6 +1426,7 @@ bindAppEventsAndStart({
     setCdnLoading,
   },
   workspaceUi: {
+    githubPrRepoSelect,
     githubPrBaseBranch,
     githubPrHeadBranch,
     githubPrTitle,

src/modules/app-core/app-bindings-startup.js

@@ -68,6 +68,7 @@ const bindAppEventsAndStart = ({
     setCdnLoading,
   } = sourceActions
   const {
+    githubPrRepoSelect,
     githubPrBaseBranch,
     githubPrHeadBranch,
     githubPrTitle,
@@ -340,7 +341,12 @@ const bindAppEventsAndStart = ({
     })
   })
 
-  for (const element of [githubPrBaseBranch, githubPrHeadBranch, githubPrTitle]) {
+  for (const element of [
+    githubPrRepoSelect,
+    githubPrBaseBranch,
+    githubPrHeadBranch,
+    githubPrTitle,
+  ]) {
     bindWorkspaceMetadataPersistence(element)
   }
 
@@ -514,6 +520,9 @@ const bindAppEventsAndStart = ({
     }
 
     setHasCompletedInitialWorkspaceBootstrap(true)
+    void flushWorkspaceSave().catch(() => {
+      /* Save failures are already surfaced through saver onError. */
+    })
     prDrawerController.syncRepositories()
     await renderPreview()
   })

src/modules/app-core/workspace-pr-session-handoff-controller.js

@@ -41,6 +41,11 @@ export const createWorkspacePrSessionHandoffController = ({
 
   let lastKnownPrContextMeta = null
 
+  const createFreshLocalHeadBranch = () => {
+    const entropy = Math.random().toString(36).slice(2, 6)
+    return `feat/component-${entropy}`
+  }
+
   const createFreshLocalEntryTab = () => {
     const now = Date.now()
 
@@ -65,14 +70,15 @@ export const createWorkspacePrSessionHandoffController = ({
   const startFreshLocalWorkspace = async ({ statusMessage } = {}) => {
     const now = Date.now()
     const localWorkspaceId = `local_${now}`
+    const freshLocalHeadBranch = createFreshLocalHeadBranch()
     let didPersistFreshWorkspace = false
 
     setWorkspacePrContextState('inactive')
     setWorkspacePrNumber(null)
     lastKnownPrContextMeta = null
 
     if (githubPrHeadBranch) {
-      githubPrHeadBranch.value = ''
+      githubPrHeadBranch.value = freshLocalHeadBranch
     }
 
     if (githubPrTitle) {
@@ -125,7 +131,7 @@ export const createWorkspacePrSessionHandoffController = ({
         id: localWorkspaceId,
         repo: getCurrentSelectedRepositoryFullName(),
         base: '',
-        head: '',
+        head: freshLocalHeadBranch,
         prTitle: '',
         prNumber: null,
         prContextState: 'inactive',

src/modules/github/pr/drawer/controller/create-controller.js

@@ -12,7 +12,6 @@ import { formatActivePrReference } from '../../context.js'
 import {
   createDefaultBranchName,
   createSelectOption,
-  isAutoGeneratedHeadBranch,
   mergeBranchOptions,
   toBranchCacheKey,
 } from '../branches.js'
@@ -237,7 +236,6 @@ export const createGitHubPrDrawer = ({
     verifyActivePullRequestContext: contextHandlers.verifyActivePullRequestContext,
     toSafeText,
     sanitizeBranchPart,
-    isAutoGeneratedHeadBranch,
     createDefaultBranchName,
     createSelectOption,
     mergeBranchOptions,
@@ -348,6 +346,7 @@ export const createGitHubPrDrawer = ({
       repositoryFullName,
       activeContext,
     })
+    syncFormForRepository({ resetAll: true })
     uiHandlers.setSubmitButtonLabel()
     uiHandlers.emitActivePrContextChange()
     return Boolean(getCurrentActivePrContext())