fix(workspaces): persist post-push sync baseline to IDB and stabilize active PR context switching.

Author: knightedcodemonkey

playwright/github-pr-drawer/active-context-switch-debounce-essential.spec.ts

@@ -1103,6 +1103,7 @@ const githubWorkflows = createGitHubWorkflowsSetup({
     getActiveWorkspaceRecordId: () => activeWorkspaceRecordId,
     setActiveWorkspaceRecordId,
     setActiveWorkspaceCreatedAt: value => (activeWorkspaceCreatedAt = value),
+    buildWorkspaceRecordSnapshot,
     listLocalContextRecords,
     refreshLocalContextOptions,
     applyWorkspaceRecord,

src/app.js

@@ -22,6 +22,7 @@ const createGitHubWorkflowsSetup = ({
     getActiveWorkspaceRecordId: workspace.getActiveWorkspaceRecordId,
     setActiveWorkspaceRecordId: workspace.setActiveWorkspaceRecordId,
     setActiveWorkspaceCreatedAt: workspace.setActiveWorkspaceCreatedAt,
+    buildWorkspaceRecordSnapshot: workspace.buildWorkspaceRecordSnapshot,
     listLocalContextRecords: workspace.listLocalContextRecords,
     refreshLocalContextOptions: workspace.refreshLocalContextOptions,
     applyWorkspaceRecord: workspace.applyWorkspaceRecord,

src/modules/app-core/github-workflows-setup.js

@@ -49,6 +49,7 @@ const initializeGitHubWorkflows = ({
   getActiveWorkspaceRecordId,
   setActiveWorkspaceRecordId,
   setActiveWorkspaceCreatedAt,
+  buildWorkspaceRecordSnapshot,
   listLocalContextRecords,
   refreshLocalContextOptions,
   applyWorkspaceRecord,
@@ -153,6 +154,29 @@ const initializeGitHubWorkflows = ({
     return true
   }
 
+  const persistActiveWorkspaceSnapshot = async () => {
+    if (typeof buildWorkspaceRecordSnapshot !== 'function') {
+      return null
+    }
+
+    const activeWorkspaceRecordId =
+      typeof getActiveWorkspaceRecordId === 'function' ? getActiveWorkspaceRecordId() : ''
+
+    const snapshot =
+      typeof activeWorkspaceRecordId === 'string' && activeWorkspaceRecordId.trim()
+        ? buildWorkspaceRecordSnapshot({ recordId: activeWorkspaceRecordId })
+        : buildWorkspaceRecordSnapshot()
+
+    if (!snapshot || typeof snapshot !== 'object') {
+      return null
+    }
+
+    const savedWorkspaceRecord = await workspaceStorage.upsertWorkspace(snapshot)
+    setActiveWorkspaceRecordId(savedWorkspaceRecord.id)
+    setActiveWorkspaceCreatedAt(savedWorkspaceRecord.createdAt ?? null)
+    return savedWorkspaceRecord
+  }
+
   const prEditorSyncController = createGitHubPrEditorSyncController({
     shouldApplySyncResult: shouldApplyActivePrEditorSync,
   })
@@ -230,6 +254,28 @@ const initializeGitHubWorkflows = ({
         onPrContextStateChange(githubAiContextState.activePrContext)
       }
 
+      const activeContextSyncKey = getActivePrContextSyncKey(
+        githubAiContextState.activePrContext,
+      )
+      if (activeContextSyncKey && activeContextSyncKey === getActivePrEditorSyncKey()) {
+        prContextUi.markActivePrEditorContentSynced()
+      }
+
+      const message = url
+        ? `Pull request opened: ${url}`
+        : 'Pull request opened successfully.'
+      if (shouldReconcileWorkspaceUpdatesForRepository(repositoryFullName)) {
+        reconcileWorkspaceTabsWithPushUpdates(fileUpdates)
+      }
+
+      if (typeof flushWorkspaceSave === 'function') {
+        try {
+          await flushWorkspaceSave({ preserveRecordId: true })
+        } catch {
+          /* Save failures are already surfaced through saver onError. */
+        }
+      }
+
       const activeWorkspaceRecordId =
         typeof getActiveWorkspaceRecordId === 'function'
           ? getActiveWorkspaceRecordId()
@@ -264,29 +310,31 @@ const initializeGitHubWorkflows = ({
 
           setActiveWorkspaceRecordId(savedWorkspaceRecord.id)
           setActiveWorkspaceCreatedAt(savedWorkspaceRecord.createdAt ?? null)
-          await refreshLocalContextOptions()
         }
       }
 
-      const activeContextSyncKey = getActivePrContextSyncKey(
-        githubAiContextState.activePrContext,
-      )
-      if (activeContextSyncKey && activeContextSyncKey === getActivePrEditorSyncKey()) {
-        prContextUi.markActivePrEditorContentSynced()
-      }
-
-      const message = url
-        ? `Pull request opened: ${url}`
-        : 'Pull request opened successfully.'
-      if (shouldReconcileWorkspaceUpdatesForRepository(repositoryFullName)) {
-        reconcileWorkspaceTabsWithPushUpdates(fileUpdates)
-      }
+      await refreshLocalContextOptions()
       showAppToast(message)
     },
-    onPullRequestCommitPushed: ({ repositoryFullName, branch, fileUpdates }) => {
+    onPullRequestCommitPushed: async ({ repositoryFullName, branch, fileUpdates }) => {
       if (shouldReconcileWorkspaceUpdatesForRepository(repositoryFullName)) {
         reconcileWorkspaceTabsWithPushUpdates(fileUpdates)
       }
+
+      try {
+        await persistActiveWorkspaceSnapshot()
+      } catch {
+        /* Fall back to debounced saver flush below. */
+      }
+
+      if (typeof flushWorkspaceSave === 'function') {
+        try {
+          await flushWorkspaceSave({ preserveRecordId: true })
+        } catch {
+          /* Save failures are already surfaced through saver onError. */
+        }
+      }
+
       const fileCount = Array.isArray(fileUpdates) ? fileUpdates.length : 0
       const message =
         fileCount > 0

src/modules/app-core/github-workflows.js

@@ -24,6 +24,28 @@ const createWorkspaceEditorHelpers = ({
   setSuppressEditorChangeSideEffects,
   editorPool,
 }) => {
+  const isTabEditedForDisplay = tab => {
+    if (!tab || typeof tab !== 'object' || tab.isDirty !== true) {
+      return false
+    }
+
+    const nextContent = typeof tab.content === 'string' ? tab.content : ''
+    const syncedContent = typeof tab.syncedContent === 'string' ? tab.syncedContent : null
+
+    if (syncedContent !== null) {
+      return nextContent !== syncedContent
+    }
+
+    const hasSyncTimestamp =
+      typeof tab.syncedAt === 'number' &&
+      Number.isFinite(tab.syncedAt) &&
+      tab.syncedAt > 0
+    const hasSyncSha =
+      typeof tab.lastSyncedRemoteSha === 'string' && tab.lastSyncedRemoteSha.trim()
+
+    return Boolean(hasSyncTimestamp || hasSyncSha)
+  }
+
   const getWorkspaceTabByKind = kind => {
     const tabs = workspaceTabsState.getTabs()
     const normalizedKind = kind === 'styles' ? 'styles' : 'component'
@@ -59,7 +81,7 @@ const createWorkspaceEditorHelpers = ({
           typeof getShouldShowEditedDesign === 'function'
             ? Boolean(getShouldShowEditedDesign())
             : true
-        const isDirty = shouldShowEditedDesign && Boolean(tab?.isDirty)
+        const isDirty = shouldShowEditedDesign && isTabEditedForDisplay(tab)
         dirtyStatusLabel.hidden = !isDirty
         if (isDirty) {
           dirtyStatusLabel.removeAttribute('aria-hidden')

src/modules/app-core/workspace-editor-helpers.js

@@ -19,6 +19,15 @@ const createWorkspaceSyncController = ({
   getRenderModeValue,
   normalizeRenderMode,
 }) => {
+  const resolveCanonicalDirtyState = ({ tab, content }) => {
+    const syncedContent = toWorkspaceSyncedContent(tab?.syncedContent)
+    if (syncedContent !== null) {
+      return content !== syncedContent
+    }
+
+    return Boolean(tab?.isDirty)
+  }
+
   const buildWorkspaceTabsSnapshot = () => {
     const activeTabId = workspaceTabsState.getActiveTabId()
     return workspaceTabsState.getTabs().map(tab => {
@@ -35,12 +44,17 @@ const createWorkspaceSyncController = ({
 
       const normalizedPath = normalizeWorkspacePathValue(currentPath)
       const targetPrFilePath = normalizedPath || getTabTargetPrFilePath(tab) || null
+      const canonicalDirtyState = resolveCanonicalDirtyState({
+        tab,
+        content: currentContent,
+      })
 
       return {
         ...tab,
         path: currentPath,
         content: currentContent,
         syncedContent: toWorkspaceSyncedContent(tab?.syncedContent),
+        isDirty: canonicalDirtyState,
         targetPrFilePath,
         isActive: activeTabId === tab.id,
         lastModified: Date.now(),

src/modules/app-core/workspace-sync-controller.js

@@ -23,6 +23,28 @@ const createWorkspaceTabsRenderer = ({
   workspaceTabsShell,
   workspaceTabAddWrap,
 }) => {
+  const isTabEditedForDisplay = tab => {
+    if (!tab || typeof tab !== 'object' || tab.isDirty !== true) {
+      return false
+    }
+
+    const nextContent = typeof tab.content === 'string' ? tab.content : ''
+    const syncedContent = typeof tab.syncedContent === 'string' ? tab.syncedContent : null
+
+    if (syncedContent !== null) {
+      return nextContent !== syncedContent
+    }
+
+    const hasSyncTimestamp =
+      typeof tab.syncedAt === 'number' &&
+      Number.isFinite(tab.syncedAt) &&
+      tab.syncedAt > 0
+    const hasSyncSha =
+      typeof tab.lastSyncedRemoteSha === 'string' && tab.lastSyncedRemoteSha.trim()
+
+    return Boolean(hasSyncTimestamp || hasSyncSha)
+  }
+
   const clearWorkspaceTabDragState = () => {
     setDraggedWorkspaceTabId('')
     setDragOverWorkspaceTabId('')
@@ -53,7 +75,7 @@ const createWorkspaceTabsRenderer = ({
       for (const tab of tabs) {
         const isActive = tab.id === activeTabId
         const isRenaming = getWorkspaceTabRenameState().tabId === tab.id
-        const isEdited = shouldShowEditedDesign && tab.isDirty
+        const isEdited = shouldShowEditedDesign && isTabEditedForDisplay(tab)
         const editedSuffix = isEdited ? ' (Edited)' : ''
         const tabContainer = document.createElement('li')
         tabContainer.className = 'workspace-tab'
@@ -235,7 +257,7 @@ const createWorkspaceTabsRenderer = ({
           tabContainer.append(metaBadge)
         }
 
-        if (shouldShowEditedDesign && tab.isDirty) {
+        if (shouldShowEditedDesign && isTabEditedForDisplay(tab)) {
           const dirtyBadge = document.createElement('span')
           dirtyBadge.className = 'workspace-tab__dirty-indicator'
           dirtyBadge.setAttribute('aria-hidden', 'true')

src/modules/app-core/workspace-tabs-renderer.js

@@ -80,6 +80,7 @@ export const createGitHubPrDrawer = ({
     pendingContextVerifyRequestKey: '',
     pendingContextVerifyPromise: null,
     lastSyncedRepositoryFullName: '',
+    lastSyncedActivePrContextKey: '',
     lastActiveContentSyncKey: '',
     baseBranchesByRepository: new Map(),
     activePrContextByRepository: new Map(),
@@ -336,6 +337,9 @@ export const createGitHubPrDrawer = ({
       return false
     }
 
+    contextHandlers.abortPendingContextVerifyRequest()
+    contextHandlers.abortPendingActiveContentSyncRequest()
+
     setRepositoryActivePrContext({
       repositoryFullName: targetRepositoryFullName,
       activeContext,

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

@@ -244,6 +244,22 @@ export const createRepositoryFormHandlers = ({
       Boolean(repositoryFullName) &&
       repositoryFullName !== state.lastSyncedRepositoryFullName
     const activeContext = getCurrentActivePrContext()
+    const activeContextSyncKey = activeContext
+      ? [
+          toSafeText(activeContext.baseBranch),
+          sanitizeBranchPart(activeContext.headBranch),
+          toSafeText(activeContext.prTitle),
+          String(
+            typeof activeContext.pullRequestNumber === 'number' &&
+              Number.isFinite(activeContext.pullRequestNumber)
+              ? activeContext.pullRequestNumber
+              : '',
+          ),
+          toSafeText(activeContext.pullRequestUrl),
+        ].join('|')
+      : ''
+    const activeContextChanged =
+      activeContextSyncKey !== state.lastSyncedActivePrContextKey
 
     const baseBranch =
       toSafeText(activeContext?.baseBranch) ||
@@ -257,7 +273,13 @@ export const createRepositoryFormHandlers = ({
       const currentHeadBranch = toSafeText(headBranchInput.value)
 
       if (activeHeadBranch) {
-        if (resetAll || resetBranch || repositoryChanged || !currentHeadBranch) {
+        if (
+          resetAll ||
+          resetBranch ||
+          repositoryChanged ||
+          activeContextChanged ||
+          !currentHeadBranch
+        ) {
           setElementValueAndPersist(headBranchInput, activeHeadBranch)
         }
       } else if (!currentHeadBranch) {
@@ -266,13 +288,23 @@ export const createRepositoryFormHandlers = ({
     }
 
     if (prTitleInput instanceof HTMLInputElement) {
-      if (resetAll || repositoryChanged || !toSafeText(prTitleInput.value)) {
+      if (
+        resetAll ||
+        repositoryChanged ||
+        activeContextChanged ||
+        !toSafeText(prTitleInput.value)
+      ) {
         setElementValueAndPersist(prTitleInput, toSafeText(activeContext?.prTitle))
       }
     }
 
     if (prBodyInput instanceof HTMLTextAreaElement) {
-      if (resetAll || repositoryChanged || !toSafeText(prBodyInput.value)) {
+      if (
+        resetAll ||
+        repositoryChanged ||
+        activeContextChanged ||
+        !toSafeText(prBodyInput.value)
+      ) {
         prBodyInput.value =
           typeof activeContext?.prBody === 'string' ? activeContext.prBody : ''
       }
@@ -289,6 +321,7 @@ export const createRepositoryFormHandlers = ({
     }
 
     state.lastSyncedRepositoryFullName = repositoryFullName
+    state.lastSyncedActivePrContextKey = activeContextSyncKey
   }
 
   const refreshContextUi = () => {