refactor: address pr comments, fix specs.

Author: knightedcodemonkey

playwright/github-pr-drawer.spec.ts

@@ -1915,7 +1915,7 @@ test('Active PR context disconnect uses local-only confirmation flow', async ({
       )
 
       const localHead = typeof localRecord?.head === 'string' ? localRecord.head : ''
-      return /^feat\/component-[a-z0-9]{4}$/.test(localHead)
+      return /^feat\/component-[a-z0-9]+-[a-z0-9]+(?:-\d+)?$/.test(localHead)
     })
     .toBe(true)
   expect(closePullRequestRequestCount).toBe(0)

src/app.js

@@ -514,6 +514,9 @@ const byotControls = createGitHubByotControls({
       githubAiContextState.selectedRepository = selectedRepository
       chatDrawerController.setSelectedRepository(selectedRepository)
       prDrawerController.setSelectedRepository(selectedRepository)
+      const isBootstrappingTokenSession =
+        typeof githubAiContextState.token !== 'string' ||
+        githubAiContextState.token.trim().length === 0
 
       if (!activeWorkspaceRecordId || activeWorkspaceCreatedAt === null) {
         void loadPreferredWorkspaceContext()
@@ -523,6 +526,14 @@ const byotControls = createGitHubByotControls({
           .catch(() => {
             /* noop */
           })
+      } else if (isBootstrappingTokenSession) {
+        void loadPreferredWorkspaceContext()
+          .then(() => {
+            prDrawerController.syncRepositories()
+          })
+          .catch(() => {
+            /* noop */
+          })
       }
     }
 

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

@@ -42,8 +42,9 @@ export const createWorkspacePrSessionHandoffController = ({
   let lastKnownPrContextMeta = null
 
   const createFreshLocalHeadBranch = () => {
-    const entropy = Math.random().toString(36).slice(2, 6)
-    return `feat/component-${entropy}`
+    const timestampSegment = Date.now().toString(36)
+    const entropySegment = Math.random().toString(36).slice(2, 10)
+    return `feat/component-${timestampSegment}-${entropySegment}`
   }
 
   const createFreshLocalEntryTab = () => {
@@ -70,6 +71,9 @@ export const createWorkspacePrSessionHandoffController = ({
   const startFreshLocalWorkspace = async ({ statusMessage } = {}) => {
     const now = Date.now()
     const localWorkspaceId = `local_${now}`
+    const selectedRepository = toNonEmptyWorkspaceText(
+      getCurrentSelectedRepositoryFullName(),
+    )
     const freshLocalHeadBranch = createFreshLocalHeadBranch()
     let didPersistFreshWorkspace = false
 
@@ -129,7 +133,7 @@ export const createWorkspacePrSessionHandoffController = ({
       const saved = await workspaceStorage.upsertWorkspace({
         ...buildWorkspaceRecordSnapshot({ recordId: localWorkspaceId }),
         id: localWorkspaceId,
-        repo: getCurrentSelectedRepositoryFullName(),
+        repo: selectedRepository,
         base: '',
         head: freshLocalHeadBranch,
         prTitle: '',