refactor: address comments.

Author: knightedcodemonkey

docs/next-steps.md

@@ -61,3 +61,10 @@ Focused follow-up work for `@knighted/develop`.
        - `const App = () => <Button />`
    - Suggested implementation prompt:
      - "Document the current implicit App behavior in @knighted/develop for auto-render mode using a compact behavior matrix and concrete component-editor snippets. Clearly distinguish supported implicit wrapping from cases that intentionally require an explicit App (such as top-level JSX mixed with imports/declarations). Keep docs concise, aligned with current runtime behavior, and include at least one positive and one explicit-error example."
+
+7. **Evaluate GitHub file upsert request strategy (metadata-first vs optimistic PUT)**
+   - Revisit the current metadata-first `upsertRepositoryFile` approach and compare it against an optimistic PUT + targeted retry-on-missing-sha flow.
+   - Measure tradeoffs for latency, GitHub API request count/rate-limit impact, and browser-console signal quality during common PR flows.
+   - If beneficial, introduce a configurable/hybrid strategy (for example, optimistic default with metadata fallback) without regressing current reliability.
+   - 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."

playwright/github-pr-drawer.spec.ts

@@ -171,8 +171,12 @@ test('Open PR drawer confirms and submits component/styles filepaths', async ({
   await expect(page.getByLabel('PR description')).toHaveValue(
     'Generated from editor content in @knighted/develop.',
   )
-  await expect(page.locator('#github-pr-toggle')).toContainText('Push')
-  await expect(page.locator('#github-pr-context-close')).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Push commit to active pull request branch' }),
+  ).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Close active pull request context' }),
+  ).toBeVisible()
 })
 
 test('Open PR drawer base dropdown updates from mocked repo branches', async ({
@@ -504,8 +508,12 @@ test('Active PR context updates controls and can be closed from AI controls', as
 
   await connectByotWithSingleRepo(page)
 
-  await expect(page.locator('#github-pr-toggle')).toContainText('Push')
-  await expect(page.locator('#github-pr-context-close')).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Push commit to active pull request branch' }),
+  ).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Close active pull request context' }),
+  ).toBeVisible()
 
   await page.getByRole('button', { name: 'Close active pull request context' }).click()
 
@@ -514,8 +522,10 @@ test('Active PR context updates controls and can be closed from AI controls', as
   await expect(page.getByText('PR: develop/pr/2')).toBeVisible()
   await dialog.getByRole('button', { name: 'Close context' }).click()
 
-  await expect(page.locator('#github-pr-toggle')).toContainText('Open PR')
-  await expect(page.locator('#github-pr-context-close')).toBeHidden()
+  await expect(page.getByRole('button', { name: 'Open pull request' })).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Close active pull request context' }),
+  ).toBeHidden()
 
   const storedValue = await page.evaluate(() =>
     localStorage.getItem('knighted:develop:github-pr-config:knightedcodemonkey/develop'),
@@ -588,8 +598,10 @@ test('Active PR context is disabled on load when pull request is closed', async
 
   await connectByotWithSingleRepo(page)
 
-  await expect(page.locator('#github-pr-toggle')).toContainText('Open PR')
-  await expect(page.locator('#github-pr-context-close')).toBeHidden()
+  await expect(page.getByRole('button', { name: 'Open pull request' })).toBeVisible()
+  await expect(
+    page.getByRole('button', { name: 'Close active pull request context' }),
+  ).toBeHidden()
   await expect(
     page.getByRole('status', { name: 'Open pull request status', includeHidden: true }),
   ).toContainText('Saved pull request context is not open on GitHub.')
@@ -945,10 +957,12 @@ test('Reloaded active PR context from URL metadata keeps Push mode and status re
 
   await connectByotWithSingleRepo(page)
 
-  await expect(page.locator('#github-pr-toggle')).toContainText('Push')
+  await expect(
+    page.getByRole('button', { name: 'Push commit to active pull request branch' }),
+  ).toBeVisible()
   await ensureOpenPrDrawerOpen(page)
   await expect(page.getByRole('button', { name: 'Push commit' }).last()).toBeVisible()
-  await expect(page.locator('#github-pr-head-branch')).toHaveValue('develop/open-pr-test')
+  await expect(page.getByLabel('Head')).toHaveValue('develop/open-pr-test')
 
   await setComponentEditorSource(page, 'const commitMarker = 1')
   await setStylesEditorSource(page, '.commit-marker { color: red; }')
@@ -1085,7 +1099,7 @@ test('Reloaded active PR context syncs editor content from GitHub branch', async
   })
 
   await connectByotWithSingleRepo(page)
-  await expect(page.locator('#render-mode')).toHaveValue('react')
+  await expect(page.getByLabel('Render mode')).toHaveValue('react')
 
   await expect
     .poll(async () =>

playwright/helpers/app-test-helpers.ts

@@ -150,15 +150,19 @@ export const ensureAiChatDrawerOpen = async (page: Page) => {
 }
 
 export const ensureOpenPrDrawerOpen = async (page: Page) => {
-  const toggle = page.locator('#github-pr-toggle')
+  const toggle = page.getByRole('button', {
+    name: /Open pull request|Push commit to active pull request branch/,
+  })
   await expect(toggle).toBeEnabled({ timeout: 60_000 })
   const isExpanded = await toggle.getAttribute('aria-expanded')
 
   if (isExpanded !== 'true') {
     await toggle.click()
   }
 
-  await expect(page.locator('#github-pr-drawer')).toBeVisible()
+  await expect(
+    page.getByRole('complementary', { name: /Open Pull Request|Push Commit/ }),
+  ).toBeVisible()
 }
 
 export const mockRepositoryBranches = async (
@@ -210,20 +214,15 @@ export const connectByotWithSingleRepo = async (page: Page) => {
     .fill('github_pat_fake_chat_1234567890')
   await page.getByRole('button', { name: 'Add GitHub token' }).click()
 
-  await expect
-    .poll(() =>
-      page.evaluate(() => {
-        const repoSelect = document.getElementById('github-pr-repo-select')
-        if (!(repoSelect instanceof HTMLSelectElement)) {
-          return false
-        }
-
-        return !repoSelect.disabled && repoSelect.value === 'knightedcodemonkey/develop'
-      }),
-    )
-    .toBe(true)
-
-  await expect(page.locator('#github-pr-toggle')).toBeVisible()
+  const repoSelect = page.getByLabel('Pull request repository')
+  await expect(repoSelect).toBeEnabled({ timeout: 60_000 })
+  await expect(repoSelect).toHaveValue('knightedcodemonkey/develop')
+
+  await expect(
+    page.getByRole('button', {
+      name: /Open pull request|Push commit to active pull request branch/,
+    }),
+  ).toBeVisible()
 }
 
 export const expectCollapseButtonState = async (

src/app.js

@@ -871,25 +871,26 @@ githubPrContextClose?.addEventListener('click', () => {
   const referenceLine = activePrReference ? `PR: ${activePrReference}\n` : ''
 
   confirmAction({
-    title: 'Close active pull request context?',
-    copy: `${referenceLine}PR title: ${githubAiContextState.activePrContext.prTitle}\nHead branch: ${githubAiContextState.activePrContext.headBranch}\n\nThis clears the active pull request context for the selected repository.`,
-    confirmButtonText: 'Close context',
-    fallbackConfirmText: 'Close active pull request context for the selected repository?',
+    title: 'Close pull request on GitHub?',
+    copy: `${referenceLine}PR title: ${githubAiContextState.activePrContext.prTitle}\nHead branch: ${githubAiContextState.activePrContext.headBranch}\n\nThis will close the pull request on GitHub and clear the active pull request context for the selected repository.`,
+    confirmButtonText: 'Close PR on GitHub',
+    fallbackConfirmText:
+      'Close this pull request on GitHub and clear the active context for the selected repository?',
     onConfirm: () => {
       void prDrawerController
         .closeActivePullRequestOnGitHub()
         .then(result => {
           const reference = result?.reference
           setStatus(
             reference
-              ? `Closed active pull request context (${reference}).`
-              : 'Closed active pull request context.',
+              ? `Closed pull request on GitHub and cleared active context (${reference}).`
+              : 'Closed pull request on GitHub and cleared active context.',
             'neutral',
           )
           showAppToast(
             reference
-              ? `Closed active pull request context (${reference}).`
-              : 'Closed active pull request context.',
+              ? `Closed pull request on GitHub and cleared active context (${reference}).`
+              : 'Closed pull request on GitHub and cleared active context.',
           )
         })
         .catch(error => {

src/modules/render-runtime.js

@@ -966,20 +966,15 @@ export const createRenderRuntimeController = ({
       }
     }
 
-    const processQueuedRenderPasses = async () => {
-      if (!rerenderRequested) {
-        return
-      }
-
-      rerenderRequested = false
-      await runRenderPass()
-      await processQueuedRenderPasses()
-    }
-
     try {
-      rerenderRequested = false
-      await runRenderPass()
-      await processQueuedRenderPasses()
+      rerenderRequested = true
+
+      while (rerenderRequested) {
+        rerenderRequested = false
+        // Intentionally sequential to drain queued renders without recursion.
+        // eslint-disable-next-line no-await-in-loop
+        await runRenderPass()
+      }
     } finally {
       renderInFlight = false
     }