refactor: address pr comments.

Author: knightedcodemonkey

.github/instructions/pr-review.md

@@ -24,6 +24,7 @@ You are reviewing changes for @knighted/develop. Be concise, technical, and spec
 ## What to verify
 
 - No generated artifacts are edited (dist/, coverage/, test-results/).
+- Duplicated logic paths are avoided when a shared helper/module already exists; prefer reusing the established implementation.
 - CDN import/fallback behavior is not bypassed with ad hoc URLs in feature modules.
 - Sensitive values (PAT/token) are not logged or exposed in UI/status output.
 - New UI behavior is covered in Playwright where appropriate.

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

@@ -1,3 +1,5 @@
+import { toWorkspaceRecordKey } from '../workspace/workspace-tab-helpers.js'
+
 const initializeGitHubWorkflows = ({
   createGitHubPrEditorSyncController,
   createGitHubChatDrawer,
@@ -120,22 +122,6 @@ const initializeGitHubWorkflows = ({
   const toSafeRepositoryFullName = value =>
     typeof value === 'string' ? value.trim() : ''
 
-  const toWorkspaceIdentitySegment = value => {
-    const normalized = typeof value === 'string' ? value.trim().toLowerCase() : ''
-
-    if (!normalized) {
-      return ''
-    }
-
-    return normalized.replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '')
-  }
-
-  const toWorkspaceRecordKey = ({ repositoryFullName, headBranch } = {}) => {
-    const repoSegment = toWorkspaceIdentitySegment(repositoryFullName) || 'local'
-    const headSegment = toWorkspaceIdentitySegment(headBranch) || 'draft'
-    return `${repoSegment}::${headSegment}`
-  }
-
   const shouldApplyActivePrEditorSync = ({ repository, activeContext }) => {
     const syncedContextKey = getActivePrContextSyncKey(activeContext)
     const currentSyncKey = getActivePrEditorSyncKey()
@@ -258,6 +244,7 @@ const initializeGitHubWorkflows = ({
       fileUpdates,
       repositoryFullName,
       pullRequestNumber,
+      branch,
     }) => {
       if (typeof onPrContextStateChange === 'function') {
         onPrContextStateChange(githubAiContextState.activePrContext)

src/modules/app-core/pr-context-records.js

@@ -44,11 +44,19 @@ const persistClosedPrContextRecords = async ({
     recordsForContext.map(record => {
       const preservedTitle =
         toNonEmptyWorkspaceText(record.prTitle) || normalizedFallbackTitle
+      const preservedPrNumber =
+        typeof record.prNumber === 'number' && Number.isFinite(record.prNumber)
+          ? record.prNumber
+          : null
+      const nextPersistedPrNumber =
+        typeof nextPrNumber === 'number' && Number.isFinite(nextPrNumber)
+          ? nextPrNumber
+          : preservedPrNumber
 
       return workspaceStorage.upsertWorkspace({
         ...record,
         prContextState: 'closed',
-        prNumber: nextPrNumber,
+        prNumber: nextPersistedPrNumber,
         prTitle: preservedTitle,
         lastModified: now,
       })