Fix OpenCode pane scroll input and registry hydration

extensions/opencode/freshell.json

@@ -16,7 +16,11 @@
       "bypassPermissions": "{\"edit\":\"allow\",\"bash\":\"allow\"}"
     },
     "supportsPermissionMode": true,
-    "supportsModel": true
+    "supportsModel": true,
+    "terminalBehavior": {
+      "preferredRenderer": "canvas",
+      "scrollInputPolicy": "fallbackToCursorKeysWhenAltScreenMouseCapture"
+    }
   },
   "picker": {
     "group": "agents"

server/extension-manager.ts

@@ -182,6 +182,7 @@ export class ExtensionManager extends EventEmitter {
           supportsSandbox: manifest.cli.supportsSandbox,
           supportsResume: !!manifest.cli.resumeArgs,
           resumeCommandTemplate,
+          terminalBehavior: manifest.cli.terminalBehavior,
         }
       }
 

server/extension-manifest.ts

@@ -42,6 +42,11 @@ const ServerConfigSchema = z.strictObject({
   singleton: z.boolean().optional().default(true),
 })
 
+const TerminalBehaviorConfigSchema = z.strictObject({
+  preferredRenderer: z.enum(['canvas']).optional(),
+  scrollInputPolicy: z.enum(['native', 'fallbackToCursorKeysWhenAltScreenMouseCapture']).optional(),
+})
+
 const CliConfigSchema = z.strictObject({
   command: z.string().min(1),
   args: z.array(z.string()).optional().default([]),
@@ -56,6 +61,7 @@ const CliConfigSchema = z.strictObject({
   supportsPermissionMode: z.boolean().optional(),
   supportsModel: z.boolean().optional(),      // shows model field in SettingsView
   supportsSandbox: z.boolean().optional(),    // shows sandbox selector in SettingsView
+  terminalBehavior: TerminalBehaviorConfigSchema.optional(),
 })
 
 // ──────────────────────────────────────────────────────────────

shared/extension-types.ts

@@ -37,5 +37,9 @@ export interface ClientExtensionEntry {
     supportsSandbox?: boolean
     supportsResume?: boolean
     resumeCommandTemplate?: string[]  // e.g., ["claude", "--resume", "{{sessionId}}"]
+    terminalBehavior?: {
+      preferredRenderer?: 'canvas'
+      scrollInputPolicy?: 'native' | 'fallbackToCursorKeysWhenAltScreenMouseCapture'
+    }
   }
 }

src/App.tsx

@@ -705,22 +705,24 @@ export default function App() {
         if (!msg?.type) return
         if (msg.type === 'ready') {
           const ready = ReadyMessageSchema.safeParse(msg)
+          const nextServerInstanceId = ready.success ? ready.data.serverInstanceId : undefined
           if (
             ready.success &&
             lastReadyServerInstanceId &&
-            lastReadyServerInstanceId !== ready.data.serverInstanceId
+            lastReadyServerInstanceId !== nextServerInstanceId
           ) {
             platformCapabilitiesLoaded = false
+            dispatch(setRegistry([]))
           }
           if (ready.success) {
-            lastReadyServerInstanceId = ready.data.serverInstanceId
+            lastReadyServerInstanceId = nextServerInstanceId
           }
           // If the initial connect attempt failed before ready, WsClient may still auto-reconnect.
           // Treat 'ready' as the source of truth for connection status.
           resetCodexActivityOverlay()
           dispatch(setError(undefined))
           dispatch(setStatus('ready'))
-          dispatch(setServerInstanceId(ready.success ? ready.data.serverInstanceId : undefined))
+          dispatch(setServerInstanceId(nextServerInstanceId))
           const newBootId = ready.success ? ready.data.bootId : undefined
           const previousBootId = appStore.getState().connection.bootId
           const serverRestarted = !!previousBootId && previousBootId !== newBootId
@@ -888,6 +890,14 @@ export default function App() {
       // sidebar snapshot. The HTTP bootstrap window remains the source of truth.
       if (ws.isReady) {
         if (cancelled) return
+        const previousServerInstanceId = appStore.getState().connection.serverInstanceId
+        if (
+          previousServerInstanceId &&
+          ws.serverInstanceId &&
+          previousServerInstanceId !== ws.serverInstanceId
+        ) {
+          dispatch(setRegistry([]))
+        }
         lastReadyServerInstanceId = ws.serverInstanceId
         resetCodexActivityOverlay()
         dispatch(setError(undefined))

src/components/TerminalView.tsx

@@ -38,6 +38,7 @@ import {
   type AttachSeqState,
 } from '@/lib/terminal-attach-seq-state'
 import { useMobile } from '@/hooks/useMobile'
+import { useEnsureExtensionsRegistry } from '@/hooks/useEnsureExtensionsRegistry'
 import { findLocalFilePaths } from '@/lib/path-utils'
 import { findUrls } from '@/lib/url-utils'
 import { setHoveredUrl, clearHoveredUrl } from '@/lib/terminal-hovered-url'
@@ -77,6 +78,13 @@ import type { PaneContent, PaneContentInput, PaneRefreshRequest, TerminalPaneCon
 import '@xterm/xterm/css/xterm.css'
 import { getHydrationQueue } from '@/lib/hydration-queue'
 import { createLogger } from '@/lib/client-logger'
+import {
+  getProviderTerminalBehavior,
+  prefersCanvasRenderer,
+  providerUsesExtensionTerminalBehavior,
+  scrollLinesToCursorKeys,
+  shouldTranslateScrollToCursorKeys,
+} from '@/lib/terminal-behavior'
 
 const log = createLogger('TerminalView')
 
@@ -359,6 +367,14 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
   // Extract terminal-specific fields (safe because we check kind later)
   const isTerminal = paneContent.kind === 'terminal'
   const terminalContent = isTerminal ? paneContent : null
+  const extensions = useAppSelector((s) => s.extensions?.entries ?? [], shallowEqual)
+  const shouldResolveProviderBehavior = isTerminal && providerUsesExtensionTerminalBehavior(terminalContent?.mode)
+  const extensionRegistryReady = useEnsureExtensionsRegistry(shouldResolveProviderBehavior)
+  const providerBehavior = useMemo(
+    () => getProviderTerminalBehavior(terminalContent?.mode, extensions),
+    [terminalContent?.mode, extensions],
+  )
+  const shouldWaitForProviderBehavior = shouldResolveProviderBehavior && !extensionRegistryReady
   const terminalSearchState = useAppSelector((state) => {
     const terminalId = terminalContent?.terminalId
     if (!terminalId) return null
@@ -402,6 +418,7 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
     pendingSinceSeq: 0,
   })
   const contentRef = useRef<TerminalPaneContent | null>(terminalContent)
+  const providerBehaviorRef = useRef(providerBehavior)
   const refreshRequestRef = useRef<PaneRefreshRequest | null>(refreshRequest)
   const handledRefreshRequestIdRef = useRef<string | null>(null)
   const hasMountedRefreshEffectRef = useRef(false)
@@ -517,6 +534,7 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
   attentionDismissRef.current = settings.panes?.attentionDismiss ?? 'click'
   debugRef.current = !!settings.logging?.debug
   refreshRequestRef.current = refreshRequest
+  providerBehaviorRef.current = providerBehavior
 
   const shouldFocusActiveTerminal = !hidden && activeTabId === tabId && activePaneId === paneId
 
@@ -537,6 +555,47 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
     lastSessionActivityAtRef.current = 0
   }, [terminalContent?.resumeSessionId])
 
+  const sendInput = useCallback((data: string) => {
+    const tid = terminalIdRef.current
+    if (!tid) return
+    // In 'type' mode, clear attention when user sends input.
+    // In 'click' mode, attention is cleared by the notification hook on tab switch.
+    if (attentionDismissRef.current === 'type') {
+      if (hasAttentionRef.current) {
+        dispatch(clearTabAttention({ tabId }))
+      }
+      if (hasPaneAttentionRef.current) {
+        dispatch(clearPaneAttention({ paneId }))
+      }
+    }
+    if (contentRef.current?.mode === 'claude' && isClaudeTurnSubmit(data)) {
+      turnCompletedSinceLastInputRef.current = false
+      dispatch(setPaneRuntimeActivity({
+        paneId: paneIdRef.current,
+        source: 'terminal',
+        phase: 'pending',
+      }))
+    }
+    ws.send({ type: 'terminal.input', terminalId: tid, data })
+  }, [dispatch, tabId, paneId, ws])
+
+  const translateScrollLinesToInput = useCallback((term: Terminal, lines: number): boolean => {
+    if (!terminalIdRef.current || lines === 0) return false
+
+    const shouldTranslate = shouldTranslateScrollToCursorKeys({
+      scrollInputPolicy: providerBehaviorRef.current.scrollInputPolicy,
+      altBufferActive: term.buffer.active.type === 'alternate',
+      mouseTrackingMode: term.modes.mouseTrackingMode,
+    })
+    if (!shouldTranslate) return false
+
+    const sequence = scrollLinesToCursorKeys(lines, term.modes.applicationCursorKeysMode)
+    if (!sequence) return false
+
+    sendInput(sequence)
+    return true
+  }, [sendInput])
+
   useEffect(() => {
     if (!isMobile || typeof window === 'undefined' || !window.visualViewport) {
       setKeyboardInsetPx(0)
@@ -654,6 +713,8 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
     if (!isMobile || !touchActiveRef.current) return
     const touch = event.touches[0]
     if (!touch) return
+    const term = termRef.current
+    if (!term) return
 
     const deltaX = Math.abs(touch.clientX - touchStartXRef.current)
     const deltaYFromStart = Math.abs(touch.clientY - touchStartYRef.current)
@@ -672,10 +733,13 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
     const rawLines = touchScrollAccumulatorRef.current / TOUCH_SCROLL_PIXELS_PER_LINE
     const lines = rawLines > 0 ? Math.floor(rawLines) : Math.ceil(rawLines)
     if (lines !== 0) {
-      termRef.current?.scrollLines(lines)
+      if (!translateScrollLinesToInput(term, lines)) {
+        term.scrollLines(lines)
+      }
+
       touchScrollAccumulatorRef.current -= lines * TOUCH_SCROLL_PIXELS_PER_LINE
     }
-  }, [clearLongPressTimer, isMobile])
+  }, [clearLongPressTimer, isMobile, translateScrollLinesToInput])
 
   const handleMobileTouchEnd = useCallback((event: ReactTouchEvent<HTMLDivElement>) => {
     if (!isMobile) return
@@ -888,30 +952,6 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
     setPendingOsc52Event(event)
   }, [attemptOsc52ClipboardWrite])
 
-  const sendInput = useCallback((data: string) => {
-    const tid = terminalIdRef.current
-    if (!tid) return
-    // In 'type' mode, clear attention when user sends input.
-    // In 'click' mode, attention is cleared by the notification hook on tab switch.
-    if (attentionDismissRef.current === 'type') {
-      if (hasAttentionRef.current) {
-        dispatch(clearTabAttention({ tabId }))
-      }
-      if (hasPaneAttentionRef.current) {
-        dispatch(clearPaneAttention({ paneId }))
-      }
-    }
-    if (contentRef.current?.mode === 'claude' && isClaudeTurnSubmit(data)) {
-      turnCompletedSinceLastInputRef.current = false
-      dispatch(setPaneRuntimeActivity({
-        paneId: paneIdRef.current,
-        source: 'terminal',
-        phase: 'pending',
-      }))
-    }
-    ws.send({ type: 'terminal.input', terminalId: tid, data })
-  }, [dispatch, tabId, paneId, ws])
-
   const resetStartupProbeParser = useCallback((opts?: { discardReplayRemainder?: boolean }) => {
     const pendingProbe = startupProbeStateRef.current.pending
     if (opts?.discardReplayRemainder) {
@@ -1111,6 +1151,7 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
   // Init xterm once
   useEffect(() => {
     if (!isTerminal) return
+    if (shouldWaitForProviderBehavior) return
     if (!containerRef.current) return
     if (mountedRef.current && termRef.current) return
     mountedRef.current = true
@@ -1161,11 +1202,8 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
       },
     })
     const rendererMode = settings.terminal.renderer ?? 'auto'
-    // OpenCode paints a dense truecolor light surface that currently renders
-    // unreliably through xterm WebGL on Chrome/Windows. Keep auto mode on the
-    // safer canvas path for that provider unless the user explicitly forces WebGL.
     const enableWebgl = rendererMode === 'webgl'
-      || (rendererMode === 'auto' && paneContent.mode !== 'opencode')
+      || (rendererMode === 'auto' && !prefersCanvasRenderer(paneContent.mode, extensions))
     let runtime = createNoopRuntime()
     try {
       runtime = createTerminalRuntime({ terminal: term, enableWebgl })
@@ -1192,6 +1230,16 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
 
     term.open(containerRef.current)
     const requestModeBypass = registerTerminalRequestModeBypass(term, sendInput)
+    term.attachCustomWheelEventHandler((event) => {
+      const lines = event.deltaY < 0 ? -1 : event.deltaY > 0 ? 1 : 0
+      if (!translateScrollLinesToInput(term, lines)) {
+        return true
+      }
+
+      event.preventDefault()
+      event.stopPropagation()
+      return false
+    })
 
     // Register custom link provider for clickable local file paths
     const filePathLinkDisposable = typeof term.registerLinkProvider === 'function'
@@ -1434,7 +1482,7 @@ export default function TerminalView({ tabId, paneId, paneContent, hidden }: Ter
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isTerminal])
+  }, [isTerminal, providerBehavior.preferredRenderer, shouldWaitForProviderBehavior])
 
   // Ref for tab to avoid re-running effects when tab changes
   const tabRef = useRef(tab)