refactor: address item five from next steps.

Author: knightedcodemonkey

docs/next-steps.md

@@ -26,15 +26,7 @@ Focused follow-up work for `@knighted/develop`.
    - Suggested implementation prompt:
      - "Evaluate and optionally optimize @knighted/develop GitHub file upsert behavior. Compare metadata-first preflight GET+PUT against optimistic PUT with retry-on-missing-sha for existing files. Keep current reliability guarantees and avoid reintroducing noisy false-positive failures. If implementing a hybrid/configurable strategy, keep defaults conservative, update docs, and validate with npm run lint plus targeted Playwright PR drawer flows."
 
-5. **Remove pre-multitab component/styles compatibility paths**
-   - Delete code paths that preserve or translate legacy single-component/single-styles storage and sync behavior from before the multitab update.
-   - Remove backward-compatibility shims, fallback field reads, and migration glue tied to old `componentFilePath`/`stylesFilePath`-style assumptions when equivalent tab-derived data exists.
-   - Favor one canonical tab-first data contract across local storage, IndexedDB workspace records, PR sync metadata, and commit target derivation.
-   - Accept breaking changes for old locally stored app state to simplify maintenance and reduce branching logic.
-   - Suggested implementation prompt:
-     - "Remove backwards-compatibility code in @knighted/develop that supports pre-multitab component/styles storage/sync behavior. Standardize on the current tab-derived schema only, delete legacy field fallbacks and migration helpers, and update tests/docs to match the simplified contract. Validate with npm run lint and targeted Playwright suites for workspace tabs + PR drawer flows."
-
-6. **Promise handling conventions (consistency of intent)**
+5. **Promise handling conventions (consistency of intent)**
    - Define a project default: use `async`/`await` with `try`/`catch` for most async control flow.
    - Keep Promise chains where they better express intent (for example, fire-and-forget paths with explicit `.catch()` to avoid unhandled rejections, or concise pass-through composition).
    - Document this as an intent-first rule so mixed syntax is acceptable only when deliberate and easy to reason about.

playwright/github-pr-drawer.spec.ts

@@ -968,8 +968,10 @@ test('Active PR context disconnect uses local-only confirmation flow', async ({
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -1141,8 +1143,10 @@ test('Active PR context updates controls and can be closed from AI controls', as
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -1231,8 +1235,10 @@ test('Active PR context is disabled on load when pull request is closed', async
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -1330,8 +1336,10 @@ test('Active PR context rehydrates after token remove and re-add', async ({ page
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/css',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'css/rehydrate-test',
@@ -1441,8 +1449,10 @@ test('Active PR context deactivates after token remove and re-add when PR is clo
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/css',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'css/rehydrate-test',
@@ -1555,8 +1565,10 @@ test('Active PR context recovers when saved head branch is missing but PR metada
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: '',
@@ -1699,8 +1711,10 @@ test('Active PR context uses Push commit flow without creating a new pull reques
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -1936,8 +1950,10 @@ test('Active PR context push commit uses Git Database API atomic path by default
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -2098,8 +2114,10 @@ test('Reloaded active PR context from URL metadata keeps Push mode and status re
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         baseBranch: 'main',
         headBranch: 'develop/open-pr-test',
@@ -2241,8 +2259,10 @@ test('Reloaded active PR context syncs editor content from GitHub branch and res
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         styleMode: 'sass',
         baseBranch: 'main',
@@ -2326,8 +2346,10 @@ test('Reloaded active PR context falls back to css style mode for unsupported va
     localStorage.setItem(
       'knighted:develop:github-pr-config:knightedcodemonkey/develop',
       JSON.stringify({
-        syncComponentFilePath: 'src/components/App.tsx',
-        syncStylesFilePath: 'src/styles/app.css',
+        syncTabTargets: [
+          { kind: 'component', path: 'src/components/App.tsx' },
+          { kind: 'styles', path: 'src/styles/app.css' },
+        ],
         renderMode: 'react',
         styleMode: 'scss',
         baseBranch: 'main',

src/app.js

@@ -755,8 +755,8 @@ const githubWorkflows = createGitHubWorkflowsSetup({
       void workspacesDrawerController?.setOpen(false)
     },
     getActivePrEditorSyncKey: () => githubAiContextState.activePrEditorSyncKey,
-    syncFromActiveContext: ({ componentPath, stylesPath }) => {
-      reconcileWorkspaceTabsWithEditorSync({ componentPath, stylesPath })
+    syncFromActiveContext: ({ tabTargets }) => {
+      reconcileWorkspaceTabsWithEditorSync({ tabTargets })
     },
     formatActivePrReference,
     githubPrContextClose,

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

@@ -204,8 +204,7 @@ const initializeGitHubWorkflows = ({
         prContextUi.markActivePrEditorContentSynced()
 
         syncFromActiveContext({
-          componentPath: args?.syncTargets?.componentFilePath,
-          stylesPath: args?.syncTargets?.stylesFilePath,
+          tabTargets: args?.syncTargets?.tabTargets,
         })
       }
 

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

@@ -134,26 +134,38 @@ const createWorkspaceSyncController = ({
   }
 
   const getEditorSyncTargets = () => {
-    const componentTab = getWorkspaceTabByKind('component')
-    const stylesTab = getWorkspaceTabByKind('styles')
+    const tabTargets = []
 
-    return {
-      componentFilePath:
-        getTabTargetPrFilePath(componentTab) ||
-        normalizeWorkspacePathValue(componentTab?.path) ||
-        '',
-      stylesFilePath:
-        getTabTargetPrFilePath(stylesTab) ||
-        normalizeWorkspacePathValue(stylesTab?.path) ||
-        '',
+    for (const kind of ['component', 'styles']) {
+      const tab = getWorkspaceTabByKind(kind)
+      const path =
+        getTabTargetPrFilePath(tab) || normalizeWorkspacePathValue(tab?.path) || ''
+
+      if (!path) {
+        continue
+      }
+
+      tabTargets.push({ kind, path })
     }
+
+    return { tabTargets }
   }
 
-  const reconcileWorkspaceTabsWithEditorSync = ({ componentPath, stylesPath } = {}) => {
-    const normalizedComponentPath = normalizeWorkspacePathValue(componentPath)
-    const normalizedStylesPath = normalizeWorkspacePathValue(stylesPath)
+  const reconcileWorkspaceTabsWithEditorSync = ({ tabTargets } = {}) => {
+    const targetsByKind = new Map()
+    const normalizedTargets = Array.isArray(tabTargets) ? tabTargets : []
+
+    for (const target of normalizedTargets) {
+      const kind = toNonEmptyWorkspaceText(target?.kind)
+      const normalizedPath = normalizeWorkspacePathValue(target?.path)
+      if (!kind || !normalizedPath) {
+        continue
+      }
 
-    if (!normalizedComponentPath && !normalizedStylesPath) {
+      targetsByKind.set(kind, normalizedPath)
+    }
+
+    if (targetsByKind.size === 0) {
       return 0
     }
 
@@ -165,8 +177,7 @@ const createWorkspaceSyncController = ({
 
     const nextTabs = workspaceTabsState.getTabs().map(tab => {
       const tabKind = getTabKind(tab)
-      const expectedPath =
-        tabKind === 'styles' ? normalizedStylesPath : normalizedComponentPath
+      const expectedPath = targetsByKind.get(tabKind)
       if (!expectedPath) {
         return tab
       }
@@ -184,6 +195,7 @@ const createWorkspaceSyncController = ({
       updatedTabCount += 1
       return {
         ...tab,
+        targetPrFilePath: matchedPath,
         content: syncedContent,
         syncedContent,
         isDirty: false,

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

@@ -24,6 +24,14 @@ const supportedStyleModes = new Set(['css', 'module', 'less', 'sass'])
 
 const toSafeText = value => (typeof value === 'string' ? value.trim() : '')
 
+const toPullRequestNumber = value => {
+  if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
+    return value
+  }
+
+  return null
+}
+
 const normalizeRenderMode = value => {
   const mode = toSafeText(value).toLowerCase()
   return supportedRenderModes.has(mode) ? mode : 'dom'
@@ -102,6 +110,26 @@ const saveRepositoryPrConfig = ({ repositoryFullName, config }) => {
   }
 }
 
+const sanitizeRepositoryPrConfig = config => {
+  const source = config && typeof config === 'object' ? config : {}
+  const pullRequestUrl = toSafeText(source.pullRequestUrl)
+  const fallbackPullRequestNumber = parsePullRequestNumberFromUrl(pullRequestUrl)
+  const pullRequestNumber =
+    toPullRequestNumber(source.pullRequestNumber) ?? fallbackPullRequestNumber
+
+  return {
+    baseBranch: toSafeText(source.baseBranch),
+    headBranch: sanitizeBranchPart(source.headBranch),
+    prTitle: toSafeText(source.prTitle),
+    prBody: typeof source.prBody === 'string' ? source.prBody.trim() : '',
+    renderMode: normalizeRenderMode(source.renderMode),
+    styleMode: normalizeStyleMode(source.styleMode),
+    isActivePr: source.isActivePr === true,
+    pullRequestNumber,
+    pullRequestUrl,
+  }
+}
+
 const removeRepositoryPrConfig = repositoryFullName => {
   if (typeof repositoryFullName !== 'string' || !repositoryFullName.trim()) {
     return
@@ -703,8 +731,15 @@ export const createGitHubPrDrawer = ({
 
     const syncTargets =
       typeof getEditorSyncTargets === 'function' ? getEditorSyncTargets() : null
-    const componentSyncPath = toSafeText(syncTargets?.componentFilePath)
-    const stylesSyncPath = toSafeText(syncTargets?.stylesFilePath)
+    const tabSyncTargets = Array.isArray(syncTargets?.tabTargets)
+      ? syncTargets.tabTargets
+      : []
+    const componentSyncPath = toSafeText(
+      tabSyncTargets.find(target => toSafeText(target?.kind) === 'component')?.path,
+    )
+    const stylesSyncPath = toSafeText(
+      tabSyncTargets.find(target => toSafeText(target?.kind) === 'styles')?.path,
+    )
 
     if (!componentSyncPath || !stylesSyncPath) {
       lastActiveContentSyncKey = ''
@@ -734,8 +769,10 @@ export const createGitHubPrDrawer = ({
         repository,
         activeContext,
         syncTargets: {
-          componentFilePath: componentSyncPath,
-          stylesFilePath: stylesSyncPath,
+          tabTargets: [
+            { kind: 'component', path: componentSyncPath },
+            { kind: 'styles', path: stylesSyncPath },
+          ],
         },
         signal: abortController.signal,
       })
@@ -837,6 +874,7 @@ export const createGitHubPrDrawer = ({
         }
 
         if (resolvedPullRequest?.isOpen) {
+          const normalizedSavedConfig = sanitizeRepositoryPrConfig(savedConfig)
           const nextHeadBranch =
             sanitizeBranchPart(resolvedPullRequest.headRef) || headBranch
           const nextBaseBranch =
@@ -845,10 +883,8 @@ export const createGitHubPrDrawer = ({
           saveRepositoryPrConfig({
             repositoryFullName,
             config: {
-              ...savedConfig,
+              ...normalizedSavedConfig,
               isActivePr: true,
-              renderMode: normalizeRenderMode(savedConfig.renderMode),
-              styleMode: normalizeStyleMode(savedConfig.styleMode),
               headBranch: nextHeadBranch,
               baseBranch: nextBaseBranch,
               pullRequestNumber: resolvedPullRequest.number,
@@ -867,7 +903,7 @@ export const createGitHubPrDrawer = ({
         saveRepositoryPrConfig({
           repositoryFullName,
           config: {
-            ...savedConfig,
+            ...sanitizeRepositoryPrConfig(savedConfig),
             isActivePr: false,
           },
         })
@@ -1147,13 +1183,14 @@ export const createGitHubPrDrawer = ({
     const currentRenderMode = normalizeRenderMode(getRenderMode?.())
     const currentStyleMode = normalizeStyleMode(getStyleMode?.())
     const existingConfig = readRepositoryPrConfig(repositoryFullName)
+    const normalizedExistingConfig = sanitizeRepositoryPrConfig(existingConfig)
     const isActivePr = existingConfig?.isActivePr === true
 
     if (isActivePr) {
       saveRepositoryPrConfig({
         repositoryFullName,
         config: {
-          ...existingConfig,
+          ...normalizedExistingConfig,
           renderMode: currentRenderMode,
           styleMode: currentStyleMode,
           isActivePr: true,
@@ -1558,6 +1595,7 @@ export const createGitHubPrDrawer = ({
       }
 
       const savedConfig = readRepositoryPrConfig(repositoryFullName)
+      const normalizedSavedConfig = sanitizeRepositoryPrConfig(savedConfig)
       const previousActiveContext =
         savedConfig?.isActivePr === true
           ? {
@@ -1574,7 +1612,7 @@ export const createGitHubPrDrawer = ({
         saveRepositoryPrConfig({
           repositoryFullName,
           config: {
-            ...savedConfig,
+            ...normalizedSavedConfig,
             isActivePr: false,
           },
         })