refactor: address pr comments.

Author: knightedcodemonkey

src/app.js

@@ -435,10 +435,10 @@ let workspaceContextStatusController = {
 }
 
 const toWorkspaceScopeMarker = value => (value === 'repository' ? 'repository' : 'local')
-const setWorkspaceScopeMarker = nextScope => (
-  (workspaceScopeMarker = toWorkspaceScopeMarker(nextScope)),
+const setWorkspaceScopeMarker = nextScope => {
+  workspaceScopeMarker = toWorkspaceScopeMarker(nextScope)
   workspaceContextStatusController.render()
-)
+}
 
 const toPullRequestNumber = value => {
   if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
@@ -524,15 +524,15 @@ const byotControls = createGitHubByotControls({
   onWritableRepositoriesChange: ({
     repositories,
     selectedRepository,
-    placeholderLabel,
+    isLoadingRepositories,
   }) => {
     githubAiContextState.writableRepositories = Array.isArray(repositories)
       ? [...repositories]
       : []
 
     workspaceContextStatusController.syncWritableRepositoriesState({
       token: githubAiContextState.token,
-      placeholderLabel,
+      isLoadingRepositories,
     })
 
     if (selectedRepository || githubAiContextState.selectedRepository) {

src/index.html

@@ -347,7 +347,9 @@ <h1>
         class="app-grid-workspace-context-status"
         id="workspace-context-status"
         hidden
+        role="status"
         aria-live="polite"
+        aria-atomic="true"
       ></div>
 
       <div class="workspace-editors-stack">

src/modules/app-core/workspace-context-status-controller.js

@@ -1,7 +1,3 @@
-const isValidationLoadingPlaceholder = placeholderLabel =>
-  typeof placeholderLabel === 'string' &&
-  placeholderLabel.trim().toLowerCase() === 'loading writable repositories...'
-
 const hasTokenValue = token => typeof token === 'string' && token.trim().length > 0
 
 const createWorkspaceContextStatusController = ({
@@ -15,6 +11,7 @@ const createWorkspaceContextStatusController = ({
   getSelectedRepositoryFullName,
 }) => {
   let hasValidatedGitHubPat = false
+  let hasCompletedRepositoryLoad = false
   const appGrid =
     statusNode instanceof HTMLElement ? statusNode.closest('.app-grid') : null
 
@@ -69,13 +66,20 @@ const createWorkspaceContextStatusController = ({
   const syncTokenState = token => {
     if (!hasTokenValue(token)) {
       hasValidatedGitHubPat = false
+      hasCompletedRepositoryLoad = false
+    } else if (hasCompletedRepositoryLoad) {
+      hasValidatedGitHubPat = true
     }
 
     render()
   }
 
-  const syncWritableRepositoriesState = ({ token, placeholderLabel }) => {
-    if (hasTokenValue(token) && !isValidationLoadingPlaceholder(placeholderLabel)) {
+  const syncWritableRepositoriesState = ({ token, isLoadingRepositories = false }) => {
+    if (!isLoadingRepositories) {
+      hasCompletedRepositoryLoad = true
+    }
+
+    if (hasTokenValue(token) && !isLoadingRepositories) {
       hasValidatedGitHubPat = true
     }
 

src/modules/github/byot-controls.js

@@ -153,7 +153,7 @@ export const createGitHubByotControls = ({
     updateTokenAddButtonState()
   }
 
-  const clearRepoOptions = placeholderLabel => {
+  const clearRepoOptions = (placeholderLabel, { isLoadingRepositories = false } = {}) => {
     if (repoSelect instanceof HTMLSelectElement) {
       repoSelect.replaceChildren(
         createDefaultRepoOption({
@@ -169,6 +169,7 @@ export const createGitHubByotControls = ({
         repositories: [],
         selectedRepository: null,
         placeholderLabel,
+        isLoadingRepositories,
       })
     }
   }
@@ -181,7 +182,10 @@ export const createGitHubByotControls = ({
     return writableRepos.find(repo => repo.fullName === lastSelectedRepository) ?? null
   }
 
-  const emitWritableRepositories = ({ placeholderLabel = '' } = {}) => {
+  const emitWritableRepositories = ({
+    placeholderLabel = '',
+    isLoadingRepositories = false,
+  } = {}) => {
     if (typeof onWritableRepositoriesChange !== 'function') {
       return
     }
@@ -190,6 +194,7 @@ export const createGitHubByotControls = ({
       repositories: [...writableRepos],
       selectedRepository: getSelectedRepositoryObject(),
       placeholderLabel,
+      isLoadingRepositories,
     })
   }
 
@@ -302,7 +307,9 @@ export const createGitHubByotControls = ({
     clearAddButtonResetTimer()
     setTokenAddButtonState('loading')
 
-    clearRepoOptions('Loading writable repositories...')
+    clearRepoOptions('Loading writable repositories...', {
+      isLoadingRepositories: true,
+    })
     setStatus('Loading writable repositories from GitHub...', 'pending')
 
     try {
@@ -373,7 +380,9 @@ export const createGitHubByotControls = ({
     tokenInput.setAttribute('aria-label', 'GitHub token')
     setTokenFieldLockState(false)
     updateTokenActionVisibility()
-    clearRepoOptions('Connect a token to load repositories')
+    clearRepoOptions('Connect a token to load repositories', {
+      isLoadingRepositories: false,
+    })
     updateTokenAddButtonState()
   }