refactor: address comments and failing webkit.

Author: knightedcodemonkey

playwright/helpers/app-test-helpers.ts

@@ -568,6 +568,7 @@ export const connectByotWithSingleRepo = async (
 
   const workspacesRepositoryFilter = page.getByLabel('Workspace repository filter')
   await expect(workspacesRepositoryFilter).toBeVisible()
+  await expect(workspacesRepositoryFilter).toBeEnabled()
   await workspacesRepositoryFilter.selectOption('knightedcodemonkey/develop')
   await expect(workspacesRepositoryFilter).toHaveValue('knightedcodemonkey/develop')
 
@@ -576,21 +577,42 @@ export const connectByotWithSingleRepo = async (
       name: 'Initialize',
       exact: true,
     })
+    const storedWorkspace = page.getByLabel('Stored workspace')
 
-    if (await initializeButton.isVisible()) {
+    await expect
+      .poll(async () => {
+        if (await initializeButton.isVisible()) {
+          return 'initialize'
+        }
+
+        if (await storedWorkspace.isVisible()) {
+          const workspaceValue = await storedWorkspace
+            .locator('option:not([value=""])')
+            .first()
+            .getAttribute('value')
+
+          if (workspaceValue) {
+            return 'stored'
+          }
+        }
+
+        return ''
+      })
+      .not.toBe('')
+
+    const autoOpenMode = (await initializeButton.isVisible()) ? 'initialize' : 'stored'
+
+    if (autoOpenMode === 'initialize') {
       await initializeButton.click()
     } else {
-      const storedWorkspace = page.getByLabel('Stored workspace')
-      if (await storedWorkspace.isVisible()) {
-        const workspaceValue = await storedWorkspace
-          .locator('option:not([value=""])')
-          .first()
-          .getAttribute('value')
-
-        if (workspaceValue) {
-          await storedWorkspace.selectOption(workspaceValue)
-          await page.getByRole('button', { name: 'Open', exact: true }).click()
-        }
+      const workspaceValue = await storedWorkspace
+        .locator('option:not([value=""])')
+        .first()
+        .getAttribute('value')
+
+      if (workspaceValue) {
+        await storedWorkspace.selectOption(workspaceValue)
+        await page.getByRole('button', { name: 'Open', exact: true }).click()
       }
     }
   }

src/modules/chat/api/completions.js

@@ -1,10 +1,4 @@
-import {
-  chatCompletionsUrl,
-  chatModelOptions,
-  defaultChatModel,
-  isFreeChatModel,
-} from './constants.js'
-import { fetchChatModelOptions } from './models.js'
+import { chatCompletionsUrl, defaultChatModel } from './constants.js'
 import {
   buildChatRequestHeaders,
   parseErrorResponse,
@@ -451,11 +445,4 @@ const requestChatCompletion = async ({
   }
 }
 
-export {
-  chatModelOptions,
-  defaultChatModel,
-  fetchChatModelOptions,
-  isFreeChatModel,
-  requestChatCompletion,
-  streamChatCompletion,
-}
+export { defaultChatModel, requestChatCompletion, streamChatCompletion }

src/modules/chat/api/models.js

@@ -18,7 +18,10 @@ const isFreeModel = model => {
     return false
   }
 
-  return pricing.prompt === '0' && pricing.completion === '0'
+  return (
+    (pricing.prompt === 0 || pricing.prompt === '0') &&
+    (pricing.completion === 0 || pricing.completion === '0')
+  )
 }
 
 const sortModelEntries = entries => {

src/modules/chat/drawer.js

@@ -182,7 +182,9 @@ export const createChatDrawer = ({
       modelPicker.syncModelSelectionForKey(nextKey)
       syncComposerAvailability()
 
-      if (open) {
+      const keyPresent = typeof nextKey === 'string' && nextKey.trim().length > 0
+
+      if (open && keyPresent) {
         void modelPicker.loadModelOptionsFromCatalog({ force: true })
       }
     },
@@ -233,7 +235,7 @@ export const createChatDrawer = ({
       promptInput.focus()
     }
 
-    if (open) {
+    if (open && hasChatKey()) {
       void modelPicker.loadModelOptionsFromCatalog()
     }
   }

src/modules/chat/model-picker.js

@@ -1,9 +1,5 @@
-import {
-  chatModelOptions,
-  defaultChatModel,
-  fetchChatModelOptions,
-  isFreeChatModel,
-} from './api/completions.js'
+import { chatModelOptions, defaultChatModel, isFreeChatModel } from './api/constants.js'
+import { fetchChatModelOptions } from './api/models.js'
 import { toModelId } from './utils.js'
 
 export const createChatModelPicker = ({
@@ -92,6 +88,10 @@ export const createChatModelPicker = ({
     const token = getChatKey()
     const normalizedToken = typeof token === 'string' ? token.trim() : ''
 
+    if (!normalizedToken) {
+      return
+    }
+
     if (!force && pendingCatalogLoadPromise) {
       await pendingCatalogLoadPromise
       return